Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af0f1e07 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Have a userId? use it."

parents bbe6f491 ec00da97

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }

    };

services/core/java/com/android/server/notification/RankingHelper.java

+4 −6
Original line number Diff line number Diff line
@@ -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);

                }