Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 01da140ace

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

Change-Id: I5add764e1665c24e54bc3d461ef0ad8ca6c880a0
This commit is contained in:
Svetoslav Ganov
2016-05-10 18:56:11 +00:00
committed by android-build-merger
parent ee9d8c1944 01da140ace
commit eed1ea9541
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
View File

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

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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();