From ec00da9714c9b5d6b3b2850520d7344789df3350 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 4 Nov 2016 12:40:13 -0400 Subject: [PATCH] Have a userId? use it. Test: manual; upgrade an app on a secondary user and validate policy xml. Change-Id: I68a9f4ad541725817344ea295b2589efd31443a4 --- .../notification/NotificationManagerService.java | 2 +- .../com/android/server/notification/RankingHelper.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 6ebdb3cd696b7..f3ae2bce997e2 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -760,7 +760,7 @@ public class NotificationManagerService extends SystemService { mListeners.onPackagesChanged(removingPackage, pkgList); mRankerServices.onPackagesChanged(removingPackage, pkgList); mConditionProviders.onPackagesChanged(removingPackage, pkgList); - mRankingHelper.onPackagesChanged(removingPackage, pkgList); + mRankingHelper.onPackagesChanged(removingPackage, changeUserId, pkgList); } } }; diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index 1bb8b3bcd3265..d65ea7f7715bd 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -716,9 +716,8 @@ public class RankingHelper implements RankingConfig { return packageBans; } - public void onPackagesChanged(boolean removingPackage, String[] pkgList) { - if (removingPackage || pkgList == null || pkgList.length == 0 - || mRestoredWithoutUids.isEmpty()) { + public void onPackagesChanged(boolean removingPackage, int changeUserId, String[] pkgList) { + if (removingPackage || pkgList == null || pkgList.length == 0) { return; // nothing to do } boolean updated = false; @@ -726,8 +725,7 @@ public class RankingHelper implements RankingConfig { final Record r = mRestoredWithoutUids.get(pkg); if (r != null) { try { - //TODO: http://b/22388012 - r.uid = mPm.getPackageUidAsUser(r.pkg, UserHandle.USER_SYSTEM); + r.uid = mPm.getPackageUidAsUser(r.pkg, changeUserId); mRestoredWithoutUids.remove(pkg); mRecords.put(recordKey(r.pkg, r.uid), r); updated = true; @@ -737,7 +735,7 @@ public class RankingHelper implements RankingConfig { } try { Record fullRecord = getRecord(pkg, - mPm.getPackageUidAsUser(pkg, UserHandle.USER_SYSTEM)); + mPm.getPackageUidAsUser(pkg, changeUserId)); if (fullRecord != null) { clampDefaultChannel(fullRecord); }