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

Commit 67fa4de7 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

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

am: 2658cb00

* commit '2658cb00':
  Make SYSTEM_ALERT_WINDOW development permission
parents e3ac1d84 2658cb00

core/res/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1461,7 +1461,7 @@ 
    <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"

    <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"

        android:label="@string/permlab_systemAlertWindow"

        android:label="@string/permlab_systemAlertWindow"

        android:description="@string/permdesc_systemAlertWindow"

        android:description="@string/permdesc_systemAlertWindow"

        android:protectionLevel="signature|preinstalled|appop|pre23" />

        android:protectionLevel="signature|preinstalled|appop|pre23|development" />





    <!-- ================================== -->

    <!-- ================================== -->

    <!-- Permissions affecting the system wallpaper -->

    <!-- Permissions affecting the system wallpaper -->

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

+10 −8
Original line number Original line Diff line number Diff line
@@ -1713,13 +1713,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
            return;

            return;

        }

        }

















        PermissionsState permissionsState = sb.getPermissionsState();







        synchronized (mPackages) {
























            for (String permission : pkg.requestedPermissions) {







            for (String permission : pkg.requestedPermissions) {











                BasePermission bp = mSettings.mPermissions.get(permission);







                BasePermission bp = mSettings.mPermissions.get(permission);











            if (bp != null && bp.isRuntime() && (grantedPermissions == null







                if (bp != null && (bp.isRuntime() || bp.isDevelopment())














                        && (grantedPermissions == null











                               || ArrayUtils.contains(grantedPermissions, permission))) {







                               || ArrayUtils.contains(grantedPermissions, permission))) {











                permissionsState.grantRuntimePermission(bp, userId);







                    grantRuntimePermission(pkg.packageName, permission, userId);














                }











            }







            }











        }







        }











    }







    }










@@ -3519,7 +3520,8 @@ public class PackageManagerService extends IPackageManager.Stub {









                            killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);







                            killUid(appId, userId, KILL_APP_REASON_GIDS_CHANGED);











                        }







                        }











                    });







                    });











                } break;







                }














                break;











            }







            }



























            mOnPermissionChangeListeners.onPermissionsChanged(uid);







            mOnPermissionChangeListeners.onPermissionsChanged(uid);