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

Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's

Browse Source 
page instead of the top level one

Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.

SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.

AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.

AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.

AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.

{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.

Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557
This commit is contained in:
Billy Lau
2015-07-27 12:57:07 +01:00
parent e37e12321b
commit fee785645b
10 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/applications/AppStateAppOpsBridge.java
View File

@@ -88,10 +88,12 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
if (requestedPermissions != null) {
for (int i = 0; i < requestedPermissions.length; i++) {
if (mPermissions[0].equals(requestedPermissions[i]) &&
(permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
if (mPermissions[0].equals(requestedPermissions[i])) {
permissionState.permissionDeclared = true;
break;
if ((permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
permissionState.staticPermissionGranted = true;
break;
}
}
}
}
@@ -164,7 +166,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
}
/*
* This method will set the packageInfo and permissionDeclared field of the associated
* This method will set the packageInfo and staticPermissionGranted field of the associated
* PermissionState, which describes a particular package.
*/
private void loadPermissionsStates(SparseArray<ArrayMap<String, PermissionState>> entries) {
@@ -185,7 +187,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
final PermissionState pe = entriesForProfile.get(packageInfo.packageName);
if (pe != null) {
pe.packageInfo = packageInfo;
pe.permissionDeclared = true;
pe.staticPermissionGranted = true;
}
}
}
@@ -279,6 +281,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
public final String packageName;
public final UserHandle userHandle;
public PackageInfo packageInfo;
public boolean staticPermissionGranted;
public boolean permissionDeclared;
public int appOpMode;
@@ -293,7 +296,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
// permission (this means pre-M gets approval during install time; M apps gets approval
// during runtime.
if (appOpMode == AppOpsManager.MODE_DEFAULT) {
return permissionDeclared;
return staticPermissionGranted;
}
return appOpMode == AppOpsManager.MODE_ALLOWED;
}