diff options
author | Christopher Dombroski <cdombroski@google.com> | 2019-04-16 12:22:56 -0700 |
---|---|---|
committer | JP Sugarbroad <jpsugar@google.com> | 2019-08-07 14:31:36 -0700 |
commit | b008d5951822c850b81e9855e0452d4eeace202e (patch) | |
tree | 6d3769f1896e3b4bf919a55a9a4c350d01d212bd | |
parent | 3ea24845681ae1e99a1b2fa4d98a372c4c518932 (diff) | |
download | Settings-b008d5951822c850b81e9855e0452d4eeace202e.tar.gz |
Treat mode_default as denied for install_unknown_appsandroid-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r49
Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
(cherry picked from commit 4b78bcd5cdff81168b5b08f72764ec9a5c0405c3)
-rw-r--r-- | src/com/android/settings/applications/AppStateInstallAppsBridge.java | 13 | ||||
-rw-r--r-- | tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java index 5b9ded648cf..69c0ed5562f 100644 --- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java +++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java @@ -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,11 +111,7 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge { } public boolean canInstallApps() { - if (appOpMode == AppOpsManager.MODE_DEFAULT) { - return permissionGranted; - } else { - return appOpMode == AppOpsManager.MODE_ALLOWED; - } + return appOpMode == AppOpsManager.MODE_ALLOWED; } public boolean isPotentialAppSource() { @@ -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(); diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java index fee7a8b65e1..badcbca5749 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java @@ -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; |