commit c04cd2db955621ddf2e1e9808792e9da82cfbe4b
author Meng Wang <mewan@google.com> Fri Oct 04 12:00:06 2019 -0700
committer Meng Wang <mewan@google.com> Fri Nov 01 17:09:26 2019 -0700
tree 2a8c92ca9d33713f9e5470ac44ca505c6172c14e
parent b946ef9061187eb1d5495fc8b6aa8fb32e920de5

Do not use hidden APIs in UserHandle/UserManager

1. UserHandle.<init>: replaced with UserHandle.of()
2. UserHandle.getCallingUserId: removed
2. UserManager.get(): replaced with getSystemService(Context.USER_SERVICE)

Bug: 137202333
Test: make
Change-Id: Ibb5fc644b4de8dfbc6d695c9ae4bc64362c9e1fa
Merged-In: I5aeedfb204d0297ecf5a9f6758562fac24de6e9e

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 320fc24..29df8b8 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -202,7 +202,8 @@
         if (DBG) log("onCreate: Intent is " + getIntent());
 
         // Make sure we are running as an admin user.
-        if (!UserManager.get(this).isAdminUser()) {
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (!userManager.isAdminUser()) {
             Toast.makeText(this, R.string.call_settings_admin_user_only,
                     Toast.LENGTH_SHORT).show();
             finish();