PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat mode_default as denied for install_unknown_apps" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-09 22:02:30 +00:00
committed by Android (Google) Code Review
parent dda677cf77 d3864daebd
commit f078971771
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/applications/AppStateInstallAppsBridge.java
View File

@@ -93,8 +93,6 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge {
final InstallAppsState appState = new InstallAppsState(); final InstallAppsState appState = new InstallAppsState();
appState.permissionRequested = hasRequestedAppOpPermission( appState.permissionRequested = hasRequestedAppOpPermission(
Manifest.permission.REQUEST_INSTALL_PACKAGES, packageName); Manifest.permission.REQUEST_INSTALL_PACKAGES, packageName);
appState.permissionGranted = hasPermission(Manifest.permission.REQUEST_INSTALL_PACKAGES,
uid);
appState.appOpMode = getAppOpMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES, uid, appState.appOpMode = getAppOpMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES, uid,
packageName); packageName);
return appState; return appState;
@@ -105,7 +103,6 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge {
*/ */
public static class InstallAppsState { public static class InstallAppsState {
boolean permissionRequested; boolean permissionRequested;
boolean permissionGranted;
int appOpMode; int appOpMode;
public InstallAppsState() { public InstallAppsState() {
@@ -113,11 +110,7 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge {
} }
public boolean canInstallApps() { public boolean canInstallApps() {
if (appOpMode == AppOpsManager.MODE_DEFAULT) { return appOpMode == AppOpsManager.MODE_ALLOWED;
return permissionGranted;
} else {
return appOpMode == AppOpsManager.MODE_ALLOWED;
}
} }
public boolean isPotentialAppSource() { public boolean isPotentialAppSource() {
@@ -126,8 +119,8 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder("[permissionGranted: " + permissionGranted); StringBuilder sb = new StringBuilder();
sb.append(", permissionRequested: " + permissionRequested); sb.append("[permissionRequested: " + permissionRequested);
sb.append(", appOpMode: " + appOpMode); sb.append(", appOpMode: " + appOpMode);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();

4
tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
View File

@@ -33,8 +33,10 @@ public class AppStateInstallAppsBridgeTest {
new AppStateInstallAppsBridge.InstallAppsState(); new AppStateInstallAppsBridge.InstallAppsState();
assertThat(appState.canInstallApps()).isFalse(); assertThat(appState.canInstallApps()).isFalse();
appState.permissionGranted = true;
appState.permissionRequested = true; appState.permissionRequested = true;
assertThat(appState.canInstallApps()).isFalse();
appState.appOpMode = AppOpsManager.MODE_ALLOWED;
assertThat(appState.canInstallApps()).isTrue(); assertThat(appState.canInstallApps()).isTrue();
appState.appOpMode = AppOpsManager.MODE_ERRORED; appState.appOpMode = AppOpsManager.MODE_ERRORED;