commit 358d96ef52c25728c5ec20085365ac2823bb08e7
author Meng Wang <mewan@google.com> Fri Oct 18 14:00:44 2019 -0700
committer Meng Wang <mewan@google.com> Mon Oct 21 22:27:43 2019 +0000
tree a943daf16e4582e18068fbef031e1e4359edd47e
parent 5277fefdcd773e1135d6710cb03ad326f0fb0287

Do not use hidden API UserManager#getPrimaryUser

Use UserHandle#isSystem instead. They're not the same when
ro.fw.system_user_split is set, but for VT functionality
this change is benign.

Bug: 137202333
Test: make
Change-Id: I1a59f78810d073d1782d8ad8498a36ea85428c09

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 0cb687f..e2eb35b 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();