commit e74672036df6750b670654304ca157d961ef6ec5
author Xin Li <delphij@google.com> Tue Sep 08 16:56:18 2020 -0700
committer Xin Li <delphij@google.com> Tue Sep 08 16:56:18 2020 -0700
tree 03325f657d0e05501852e687dd59080a7379d870
parent 463063d26aa48dafefbd1068716c02a1d5a36336
parent d4c03cbfc0c1520acc2951e4d624c9a096914741

Merge Android R

Bug: 168057903
Merged-In: Idfe5b27aaac2ad35cb2626afaf7d9ca5dca4ef4d
Change-Id: Ib50090d3776ab4a7877b3326c4fbe88e4890a7ee

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b202c37..595052e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true"
         android:allowBackup="true"
+        android:forceQueryable="true"
         android:backupAgent=".BlockedNumberBackupAgent"
         android:killAfterRestore="false">
 

src/com/android/providers/blockednumber/BlockedNumberProvider.java

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 4d6a284..1458c1c 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -39,6 +39,7 @@
 import android.os.CancellationSignal;
 import android.os.PersistableBundle;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.SystemContract;
@@ -451,8 +452,7 @@
     }
 
     private boolean canCurrentUserBlockUsers() {
-        UserManager userManager = getContext().getSystemService(UserManager.class);
-        return userManager.isPrimaryUser();
+        return getContext().getUserId() == UserHandle.USER_SYSTEM;
     }
 
     private void notifyEmergencyContact() {