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

Unverified Commit 0224ac5d authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r49' into staging/lineage-16.0_merge-android-9.0.0_r49 

Android 9.0.0 Release 49 (5794013)

* tag 'android-9.0.0_r49':
  Treat mode_default as denied for install_unknown_apps
  [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
  Do not allow draw on top for App notification settings
  Do not allow draw on top for default sms picker.
  Hide quicksetting tile for dev options when it's turned off
  Update PBAP info for all pairing dialogs. DO NOT MERGE
  Hide SettingsSlice provider
  Disable changing lock when device is not provisioned.

Change-Id: I705fc2d3c72ea97721d4640a639078c18fbe5ac5
parents 27ae53a7 b008d595

src/com/android/settings/applications/AppStateInstallAppsBridge.java

+3 −10
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge { 
        final InstallAppsState appState = new InstallAppsState();

        appState.permissionRequested = hasRequestedAppOpPermission(

                Manifest.permission.REQUEST_INSTALL_PACKAGES, packageName);

        appState.permissionGranted = hasPermission(Manifest.permission.REQUEST_INSTALL_PACKAGES,

                uid);

        appState.appOpMode = getAppOpMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES, uid,

                packageName);

        return appState;
@@ -106,7 +104,6 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge { 
     */

    public static class InstallAppsState {

        boolean permissionRequested;

        boolean permissionGranted;

        int appOpMode;



        public InstallAppsState() {
@@ -114,12 +111,8 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge { 
        }



        public boolean canInstallApps() {

            if (appOpMode == AppOpsManager.MODE_DEFAULT) {

                return permissionGranted;

            } else {

            return appOpMode == AppOpsManager.MODE_ALLOWED;

        }

        }



        public boolean isPotentialAppSource() {

            return appOpMode != AppOpsManager.MODE_DEFAULT || permissionRequested;
@@ -127,8 +120,8 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge { 


        @Override

        public String toString() {

            StringBuilder sb = new StringBuilder("[permissionGranted: " + permissionGranted);

            sb.append(", permissionRequested: " + permissionRequested);

            StringBuilder sb = new StringBuilder();

            sb.append("[permissionRequested: " + permissionRequested);

            sb.append(", appOpMode: " + appOpMode);

            sb.append("]");

            return sb.toString();

tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java

+3 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ public class AppStateInstallAppsBridgeTest { 
            new AppStateInstallAppsBridge.InstallAppsState();

        assertThat(appState.canInstallApps()).isFalse();



        appState.permissionGranted = true;

        appState.permissionRequested = true;

        assertThat(appState.canInstallApps()).isFalse();



        appState.appOpMode = AppOpsManager.MODE_ALLOWED;

        assertThat(appState.canInstallApps()).isTrue();



        appState.appOpMode = AppOpsManager.MODE_ERRORED;