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

Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev

Browse Source 
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
  Make SYSTEM_ALERT_WINDOW development permission
This commit is contained in:
Svetoslav Ganov
2015-10-29 01:16:46 +00:00
committed by android-build-merger
parent b69cab65d1 2658cb002a
commit 35151fbc8b
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
View File

@@ -1469,7 +1469,7 @@
<permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
android:label="@string/permlab_systemAlertWindow"
android:description="@string/permdesc_systemAlertWindow"
android:protectionLevel="signature|preinstalled|appop|pre23" />
android:protectionLevel="signature|preinstalled|appop|pre23|development" />
<!-- ================================== -->
<!-- Permissions affecting the system wallpaper -->

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

@@ -1713,13 +1713,14 @@ public class PackageManagerService extends IPackageManager.Stub {
return;
}
PermissionsState permissionsState = sb.getPermissionsState();
for (String permission : pkg.requestedPermissions) {
BasePermission bp = mSettings.mPermissions.get(permission);
if (bp != null && bp.isRuntime() && (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) {
permissionsState.grantRuntimePermission(bp, userId);
synchronized (mPackages) {
for (String permission : pkg.requestedPermissions) {
BasePermission bp = mSettings.mPermissions.get(permission);
if (bp != null && (bp.isRuntime() || bp.isDevelopment())
&& (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) {
grantRuntimePermission(pkg.packageName, permission, userId);
}
}
}
}
@@ -3519,7 +3520,8 @@ public class PackageManagerService extends IPackageManager.Stub {
killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);
}
});
} break;
}
break;
}
mOnPermissionChangeListeners.onPermissionsChanged(uid);