commit d3f3a7b4c4578a0494f54391215fd4e53e85a60c
author Xiaohui Chen <xiaohuic@google.com> Wed Oct 28 18:01:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 28 18:01:57 2015 +0000
tree 1a1c199d7943c17970158a14e57cd494ba7306b9
parent ea7be853d5b68b05f44c7d937ce9498f3a0e6e34
parent 6e9c8b7b8406f35dd3a1a2d6d163447d243933f6

Merge "Clean up USER_OWNER in contacts provider"

src/com/android/providers/contacts/CallLogProvider.java

diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index 13264a9..64ec14d 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -462,14 +462,14 @@
      */
     private void syncEntriesFromPrimaryUser(UserManager userManager) {
         final int userHandle = userManager.getUserHandle();
-        if (userHandle == UserHandle.USER_OWNER
-                || userManager.getUserInfo(userHandle).isManagedProfile()) {
+        // TODO: http://b/24944959
+        if (userManager.isSameProfileGroup(UserHandle.USER_SYSTEM, userHandle)) {
             return;
         }
 
         final long lastSyncTime = getLastSyncTime();
         final Uri uri = ContentProvider.maybeAddUserId(CallLog.Calls.CONTENT_URI,
-                UserHandle.USER_OWNER);
+                UserHandle.USER_SYSTEM);
         final Cursor cursor = getContext().getContentResolver().query(
                 uri,
                 CALL_LOG_SYNC_PROJECTION,