Merge "Don't throw runtime exceptions for permission flags" into nyc-dev (01da140a) · Commits · e / os / android_frameworks_base

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) {

+3 −3

Original line number	Diff line number	Diff line
		@@ -4265,17 +4265,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();