Make SYSTEM_ALERT_WINDOW development permission

sganov · sganov · commit 01af6a42a6a0 · 2015-10-27T18:12:06.000-07:00
bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
@@ -1461,7 +1461,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 -->
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1713,13 +1713,14 @@ private void grantRequestedRuntimePermissionsForUser(PackageParser.Package pkg,
             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 void run() {
                             killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);
                         }
                     });
-                } break;
+                }
+                break;
             }
 
             mOnPermissionChangeListeners.onPermissionsChanged(uid);

Original file line number	Diff line number	Diff line change
`@@ -1713,13 +1713,14 @@ private void grantRequestedRuntimePermissionsForUser(PackageParser.Package pkg,`
`1713`	`1713`	`return;`
`1714`	`1714`	`}`
`1715`	`1715`
`1716`		`- PermissionsState permissionsState = sb.getPermissionsState();`
`1717`		`-`
`1718`		`- for (String permission : pkg.requestedPermissions) {`
`1719`		`- BasePermission bp = mSettings.mPermissions.get(permission);`
`1720`		`- if (bp != null && bp.isRuntime() && (grantedPermissions == null`
`1721`		`- \|\| ArrayUtils.contains(grantedPermissions, permission))) {`
`1722`		`- permissionsState.grantRuntimePermission(bp, userId);`
	`1716`	`+ synchronized (mPackages) {`
	`1717`	`+ for (String permission : pkg.requestedPermissions) {`
	`1718`	`+ BasePermission bp = mSettings.mPermissions.get(permission);`
	`1719`	`+ if (bp != null && (bp.isRuntime() \|\| bp.isDevelopment())`
	`1720`	`+ && (grantedPermissions == null`
	`1721`	`+ \|\| ArrayUtils.contains(grantedPermissions, permission))) {`
	`1722`	`+ grantRuntimePermission(pkg.packageName, permission, userId);`
	`1723`	`+ }`
`1723`	`1724`	`}`
`1724`	`1725`	`}`
`1725`	`1726`	`}`
`@@ -3519,7 +3520,8 @@ public void run() {`
`3519`	`3520`	`killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);`
`3520`	`3521`	`}`
`3521`	`3522`	`});`
`3522`		`- } break;`
	`3523`	`+ }`
	`3524`	`+ break;`
`3523`	`3525`	`}`
`3524`	`3526`
`3525`	`3527`	`mOnPermissionChangeListeners.onPermissionsChanged(uid);`