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

Commit 01da140a authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Don't throw runtime exceptions for permission flags" into nyc-dev

parents 0158baf9 7e01af42

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

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

            if (DEBUG) Log.i(TAG, "Rebuilding...");

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

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

                AppEntry entry = apps.get(i);

                AppEntry entry = apps.get(i);

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

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

                    synchronized (mEntriesMap) {

                    synchronized (mEntriesMap) {

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

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

                        if (comparator != null) {

                        if (comparator != null) {

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

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

        synchronized (mPackages) {

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

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

            if (pkg == null) {

            if (pkg == null) {

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

                return 0;

            }

            }











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




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








            if (bp == null) {




            if (bp == null) {








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




                return 0;








            }




            }


















            SettingBase sb = (SettingBase) pkg.mExtras;




            SettingBase sb = (SettingBase) pkg.mExtras;








            if (sb == null) {




            if (sb == null) {








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




                return 0;








            }




            }


















            PermissionsState permissionsState = sb.getPermissionsState();




            PermissionsState permissionsState = sb.getPermissionsState();