Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Have a userId? use it."

Browse Source
This commit is contained in:
Julia Reynolds
2016-11-08 20:51:11 +00:00
committed by Android (Google) Code Review
parent bbe6f49147 ec00da9714
commit af0f1e071d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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);
}
}
};

10
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -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);
}