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

Commit 9d629c85 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev 

am: 632c036d

Change-Id: I1f76c36d330c50b17fc6df35ffb014e3e97e3640
parents 741bcbee 632c036d

services/usage/java/com/android/server/usage/UsageStatsService.java

+1 −2
Original line number Diff line number Diff line
@@ -924,8 +924,7 @@ public class UsageStatsService extends SystemService implements 
            } catch (RemoteException re) {

                throw re.rethrowFromSystemServer();

            }

            final int packageUid = mPackageManagerInternal.getPackageUid(packageName,

                    PackageManager.MATCH_ANY_USER, userId);

            final int packageUid = mPackageManagerInternal.getPackageUid(packageName, 0, userId);

            // If the calling app is asking about itself, continue, else check for permission.

            if (packageUid != callingUid) {

                if (!hasPermission(callingPackage)) {