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

Commit 0529672a authored by John Reck's avatar John Reck
Browse files

resolve merge conflicts of a1b8d77c to master. 

Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5
parents d8f56833 a1b8d77c

core/res/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1476,7 +1476,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

+5 −3
Original line number Original line Diff line number Diff line
@@ -1759,7 +1759,8 @@ public class PackageManagerService extends IPackageManager.Stub { 
        synchronized (mPackages) {

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

                    final int flags = permissionsState.getPermissionFlags(permission, userId);

                    final int flags = permissionsState.getPermissionFlags(permission, userId);

                    // Installer cannot change immutable permissions.

                    // Installer cannot change immutable permissions.
@@ -3567,7 +3568,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);