commit a41cd4b87da935095934e91392cb0af7301feb4a
author Meng Wang <mewan@google.com> Mon Oct 21 22:27:57 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 21 22:27:57 2019 +0000
tree 0c4faf475cc59f1cd6071ddc837616489d9eb81b
parent bc0cc6a7e700a809a49516bd4140d4908321e462
parent 358d96ef52c25728c5ec20085365ac2823bb08e7

Merge "Do not use hidden API UserManager#getPrimaryUser"

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 2e923ec..3102b0b 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -35,7 +35,6 @@
 import android.os.Looper;
 import android.os.PersistableBundle;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -804,10 +803,7 @@
 
                 int userHandleId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
                 UserHandle currentUserHandle = UserHandle.of(userHandleId);
-                UserManager userManager =
-                        (UserManager) context.getSystemService(Context.USER_SERVICE);
-                mIsPrimaryUser = userManager.getPrimaryUser().getUserHandle()
-                        .equals(currentUserHandle);
+                mIsPrimaryUser = currentUserHandle.isSystem();
 
                 // Any time the user changes, re-register the accounts.
                 tearDownAccounts();