5e1521700f
Some patches were ported from 12 to 10/11 Some patches from 11 were ported to 10 This 10/11 port should be very close to 12 BOUNS: 16.0 patches, disabled Signed-off-by: Tad <tad@spotco.us>
63 lines
3.1 KiB
Diff
63 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Sat, 22 Jul 2017 21:43:50 -0400
|
|
Subject: [PATCH] always treat INTERNET as a runtime permission
|
|
|
|
ported from 10: 6c4f112dde47f21ce5a583f5bd8b217db6de5c02
|
|
---
|
|
.../permission/model/AppPermissionGroup.java | 5 +++--
|
|
.../permissioncontroller/permission/model/Permission.java | 3 ++-
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/com/android/permissioncontroller/permission/model/AppPermissionGroup.java b/src/com/android/permissioncontroller/permission/model/AppPermissionGroup.java
|
|
index aeb90811b..0399a1836 100644
|
|
--- a/src/com/android/permissioncontroller/permission/model/AppPermissionGroup.java
|
|
+++ b/src/com/android/permissioncontroller/permission/model/AppPermissionGroup.java
|
|
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager;
|
|
import android.content.pm.PackageManager.NameNotFoundException;
|
|
import android.content.pm.PermissionGroupInfo;
|
|
import android.content.pm.PermissionInfo;
|
|
+import android.Manifest;
|
|
import android.os.Build;
|
|
import android.os.UserHandle;
|
|
import android.permission.PermissionManager;
|
|
@@ -872,7 +873,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
|
|
|
|
boolean wasGranted = permission.isGrantedIncludingAppOp();
|
|
|
|
- if (mAppSupportsRuntimePermissions) {
|
|
+ if (mAppSupportsRuntimePermissions || Manifest.permission.INTERNET.equals(permission.getName())) {
|
|
// Do not touch permissions fixed by the system.
|
|
if (permission.isSystemFixed()) {
|
|
wasAllGranted = false;
|
|
@@ -1057,7 +1058,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
|
|
break;
|
|
}
|
|
|
|
- if (mAppSupportsRuntimePermissions) {
|
|
+ if (mAppSupportsRuntimePermissions || Manifest.permission.INTERNET.equals(permission.getName())) {
|
|
// Revoke the permission if needed.
|
|
if (permission.isGranted()) {
|
|
permission.setGranted(false);
|
|
diff --git a/src/com/android/permissioncontroller/permission/model/Permission.java b/src/com/android/permissioncontroller/permission/model/Permission.java
|
|
index 49381db2b..3af5241af 100644
|
|
--- a/src/com/android/permissioncontroller/permission/model/Permission.java
|
|
+++ b/src/com/android/permissioncontroller/permission/model/Permission.java
|
|
@@ -18,6 +18,7 @@ package com.android.permissioncontroller.permission.model;
|
|
|
|
import android.content.pm.PackageManager;
|
|
import android.content.pm.PermissionInfo;
|
|
+import android.Manifest;
|
|
|
|
import androidx.annotation.NonNull;
|
|
|
|
@@ -137,7 +138,7 @@ public final class Permission {
|
|
* @return {@code true} if the permission (and the app-op) is granted.
|
|
*/
|
|
public boolean isGrantedIncludingAppOp() {
|
|
- return mGranted && (!affectsAppOp() || isAppOpAllowed()) && !isReviewRequired();
|
|
+ return mGranted && (!affectsAppOp() || isAppOpAllowed()) && (!isReviewRequired() || Manifest.permission.INTERNET.equals(mName));
|
|
}
|
|
|
|
public boolean isReviewRequired() {
|