commit f3ce569c3e26fbc53f9d7c36973f0f61c6ae8816
author Amit Mahajan <amitmahajan@google.com> Fri Dec 13 17:58:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 17:58:38 2019 +0000
tree 370acadc6c3b6d6d74a9c68f5b48c0efe30cc752
parent 9f90305051b0936838850406f164719e6f507bdd
parent 67caf6d0ebb6d632de041ba93a43b63279e652c9

Merge "Revert "Split TeleService into a client apk and a lib.""

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 092e08b..5a1e6a6 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;
@@ -806,10 +805,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();