Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-11-12 10:26:28 -05:00
parent b81d39c969
commit decf46084c
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
6 changed files with 11 additions and 11 deletions

View File

@ -23,7 +23,7 @@ index cb6ef5a8f1ae..4692ddb26491 100644
<!-- Allows applications to access information about networks. <!-- Allows applications to access information about networks.
<p>Protection level: normal <p>Protection level: normal
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 8ef30f2d5be2..e46aa980468c 100644 index 5f0beea38af5..ba5572eb4383 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {

View File

@ -99,7 +99,7 @@ index 27c9026c863a..4a8624222ae8 100644
<string name="permlab_readCalendar">Read calendar events and details</string> <string name="permlab_readCalendar">Read calendar events and details</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index e46aa980468c..2dc4f5b39253 100644 index ba5572eb4383..f7a09f49aacb 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2592,7 +2592,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {

View File

@ -8,7 +8,7 @@ Subject: [PATCH] extend special runtime permission implementation
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 41b43e3c38bd..8ef30f2d5be2 100644 index eeff027cb46c..5f0beea38af5 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -1881,7 +1881,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
@ -29,7 +29,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
uidState.updatePermissionFlags(permission, uidState.updatePermissionFlags(permission,
PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
| PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
@@ -2851,7 +2851,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2815,7 +2815,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
// continue; // continue;
// } // }
@ -38,7 +38,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
if (DEBUG_PERMISSIONS) { if (DEBUG_PERMISSIONS) {
Log.i(TAG, "Denying runtime-only permission " + bp.getName() Log.i(TAG, "Denying runtime-only permission " + bp.getName()
+ " for package " + friendlyName); + " for package " + friendlyName);
@@ -2930,7 +2930,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2894,7 +2894,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
boolean restrictionApplied = (origState.getPermissionFlags( boolean restrictionApplied = (origState.getPermissionFlags(
bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
@ -47,7 +47,7 @@ index 41b43e3c38bd..8ef30f2d5be2 100644
// If hard restricted we don't allow holding it // If hard restricted we don't allow holding it
if (permissionPolicyInitialized && hardRestricted) { if (permissionPolicyInitialized && hardRestricted) {
if (!restrictionExempt) { if (!restrictionExempt) {
@@ -3015,7 +3015,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2978,7 +2978,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
if (restrictionApplied) { if (restrictionApplied) {
flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION; flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION;
// Dropping restriction on a legacy app implies a review // Dropping restriction on a legacy app implies a review

View File

@ -20,7 +20,7 @@ Signed-off-by: Danny Lin <danny@kdrag0n.dev>
1 file changed, 20 insertions(+), 5 deletions(-) 1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 54a6c678e0da..41b43e3c38bd 100644 index 2662f620cbd4..eeff027cb46c 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1525,7 +1525,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -1525,7 +1525,8 @@ public class PermissionManagerService extends IPermissionManager.Stub {
@ -74,7 +74,7 @@ index 54a6c678e0da..41b43e3c38bd 100644
/** /**
* Restore the permission state for a package. * Restore the permission state for a package.
* *
@@ -2966,6 +2974,13 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -2929,6 +2937,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {
} }
} }
} }
@ -88,7 +88,7 @@ index 54a6c678e0da..41b43e3c38bd 100644
} else { } else {
if (origPermState == null) { if (origPermState == null) {
// New permission // New permission
@@ -3803,7 +3818,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { @@ -3766,7 +3781,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
if (shouldGrantPermission) { if (shouldGrantPermission) {
final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission, final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission,
myUid, userId); myUid, userId);

View File

@ -81,7 +81,7 @@ index 12e29e693b..b6745806b5 100644
android:id="@+id/private_dns_mode_opportunistic" android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/> layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a5354ef8bc..b7c9a4b6b4 100644 index 3ea294b8d5..15c0237c8a 100644
--- a/res/values/cm_strings.xml --- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml
@@ -81,6 +81,21 @@ @@ -81,6 +81,21 @@

View File

@ -64,7 +64,7 @@ index 924cd3345..fa96b73c0 100644
/** /**
* Randomized MAC address to use with this particular network * Randomized MAC address to use with this particular network
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 1c87eb2fa..9032bfb54 100644 index b0212133a..5f40104ce 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java --- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -431,6 +431,10 @@ public class WifiConfigManager { @@ -431,6 +431,10 @@ public class WifiConfigManager {