commit 21487ab9473d3539be76dc473ce85f6217514c09
author Meng Wang <mewan@google.com> Thu Nov 21 10:44:42 2019 -0800
committer Meng Wang <mewan@google.com> Thu Nov 21 10:45:31 2019 -0800
tree a9b3633e0e92d55ad21be5b31c90beb849240cea
parent d63128dc1a6a6b1182fa58084512aa7ccc4b5dc1

Do not use hidden UserManager hidden APIs

Bug: 137202333
Test: make
Change-Id: I508baa267a66046936c538032a719e0af864985f

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 410965b..66017e4 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -29,7 +29,6 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Handler;
@@ -564,16 +563,15 @@
                     builder.build(),
                     UserHandle.ALL);
         } else {
-            List<UserInfo> users = mUserManager.getUsers(true);
-            for (UserInfo user : users) {
-                if (mUserManager.isManagedProfile(user.getUserHandle().getIdentifier())) {
+            List<UserHandle> users = getUsersExcludeDying();
+            for (UserHandle user : users) {
+                if (mUserManager.isManagedProfile(user.getIdentifier())) {
                     continue;
                 }
-                UserHandle userHandle = user.getUserHandle();
                 cancelAsUser(
                         Integer.toString(subId) /* tag */,
                         CALL_FORWARD_NOTIFICATION,
-                        userHandle);
+                        user);
             }
         }
     }