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

Commit 40b9ac7e authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents fa9f21a1 0224ac5d

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;