commit 91496cee6827b9bafcb8ea0e3416ac9c415efa98
author Felipe Leme <felipeal@google.com> Fri Aug 16 15:23:55 2019 -0700
committer Felipe Leme <felipeal@google.com> Fri Aug 16 23:14:59 2019 +0000
tree f7369afb99b4e5d51ae023f3aed7290846a32e4e
parent b4d77790211694d1e04d71f20c6216b69a7a984b

Fixed BNP.canCurrentUserBlockUsers()

BNP was designed to run under user 0 (system), which on phones is the primary user.

But on automotive, user 0 is "headless", and the primary user is the first "human" user.

Test: manual verification on automotive
Test: atest CtsHostsideNumberBlockingTestCases #  on auto and walleye

Fixes: 139484721
Bug: 139551240
Bug: 139551257

Change-Id: I3dfeabc4b3f926b84308b221e5d59ed73c77b5ff

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 2e029d8..c0f4737 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() {