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

Commit d261a016 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Don\'t throw runtime exceptions for permission flags" into nyc-dev am: 01da140a 

am: b472f4c3

* commit 'b472f4c3':
  Don't throw runtime exceptions for permission flags

Change-Id: I92c698b5ab1a640cb83c420040df0f67f508abff
parents 1e838802 b472f4c3

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ public class ApplicationsState { 
            if (DEBUG) Log.i(TAG, "Rebuilding...");

            for (int i=0; i<apps.size(); i++) {

                AppEntry entry = apps.get(i);

                if (filter == null || filter.filterApp(entry)) {

                if (entry != null && (filter == null || filter.filterApp(entry))) {

                    synchronized (mEntriesMap) {

                        if (DEBUG_LOCKING) Log.v(TAG, "rebuild acquired lock");

                        if (comparator != null) {

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -4271,17 +4271,17 @@ public class PackageManagerService extends IPackageManager.Stub { 
        synchronized (mPackages) {

            final PackageParser.Package pkg = mPackages.get(packageName);

            if (pkg == null) {

                throw new IllegalArgumentException("Unknown package: " + packageName);

                return 0;

            }















            final BasePermission bp = mSettings.mPermissions.get(name);















            if (bp == null) {













                throw new IllegalArgumentException("Unknown permission: " + name);













                return 0;















            }





























            SettingBase sb = (SettingBase) pkg.mExtras;















            if (sb == null) {













                throw new IllegalArgumentException("Unknown package: " + packageName);













                return 0;















            }





























            PermissionsState permissionsState = sb.getPermissionsState();