Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-25 07:29:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Missing patches for 16.0 + Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-01-08 07:40:35 -05:00
parent 10c1d825c2
commit 57d951ccb5
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
9 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Patches/Common/contributors.db
View File

Binary file not shown.

4
Patches/LineageOS-16.0/android_frameworks_base/0013-Network_Permission-1.patch
View File

@ -22,10 +22,10 @@ index 0aafab66dabd..c66b55feff34 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 9f1fe8a6414a..f16f671a51dd 100644 index b0bf73293452..d3367ea8e26d 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
@@ -731,7 +731,7 @@ public class PermissionManagerService { @@ -771,7 +771,7 @@ public class PermissionManagerService {
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

4
Patches/LineageOS-16.0/android_frameworks_base/0013-Sensors_Permission.patch
View File

@ -81,10 +81,10 @@ index fd30d719b996..1a64ae235456 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 f16f671a51dd..4a60c12e9823 100644 index d3367ea8e26d..a36f31dd5af6 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
@@ -731,7 +731,7 @@ public class PermissionManagerService { @@ -771,7 +771,7 @@ public class PermissionManagerService {
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

20
Patches/LineageOS-16.0/android_frameworks_base/0013-Special_Permissions.patch
View File

@ -11,7 +11,7 @@ need to be granted by default for all apps to maintain compatibility.
2 files changed, 25 insertions(+), 8 deletions(-) 2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5b454f2d8939..ab6333e7396f 100644 index 25f70b23e68f..443d9a1a2f91 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19729,7 +19729,8 @@ public class PackageManagerService extends IPackageManager.Stub @@ -19729,7 +19729,8 @@ public class PackageManagerService extends IPackageManager.Stub
@ -25,10 +25,10 @@ index 5b454f2d8939..ab6333e7396f 100644
!= PERMISSION_OPERATION_FAILURE) { != PERMISSION_OPERATION_FAILURE) {
writeRuntimePermissions = true; writeRuntimePermissions = true;
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 79b2636481b3..9f1fe8a6414a 100644 index bdfe64c2c348..b0bf73293452 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
@@ -730,6 +730,10 @@ public class PermissionManagerService { @@ -770,6 +770,10 @@ public class PermissionManagerService {
} }
} }
@ -39,7 +39,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
private void grantPermissions(PackageParser.Package pkg, boolean replace, private void grantPermissions(PackageParser.Package pkg, boolean replace,
String packageOfInterest, PermissionCallback callback) { String packageOfInterest, PermissionCallback callback) {
// IMPORTANT: There are two types of permissions: install and runtime. // IMPORTANT: There are two types of permissions: install and runtime.
@@ -838,7 +842,8 @@ public class PermissionManagerService { @@ -878,7 +882,8 @@ public class PermissionManagerService {
// their permissions as always granted runtime ones since we need // their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an // to keep the review required permission flag per user while an
// install permission's state is shared across all users. // install permission's state is shared across all users.
@ -49,7 +49,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
// For legacy apps dangerous permissions are install time ones. // For legacy apps dangerous permissions are install time ones.
grant = GRANT_INSTALL; grant = GRANT_INSTALL;
} else if (origPermissions.hasInstallPermission(bp.getName())) { } else if (origPermissions.hasInstallPermission(bp.getName())) {
@@ -948,7 +953,8 @@ public class PermissionManagerService { @@ -988,7 +993,8 @@ public class PermissionManagerService {
updatedUserIds, userId); updatedUserIds, userId);
} }
} else if (mSettings.mPermissionReviewRequired } else if (mSettings.mPermissionReviewRequired
@ -59,7 +59,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
// For legacy apps that need a permission review, every new // For legacy apps that need a permission review, every new
// runtime permission is granted but it is pending a review. // runtime permission is granted but it is pending a review.
// We also need to review only platform defined runtime // We also need to review only platform defined runtime
@@ -969,7 +975,15 @@ public class PermissionManagerService { @@ -1009,7 +1015,15 @@ public class PermissionManagerService {
updatedUserIds = ArrayUtils.appendInt( updatedUserIds = ArrayUtils.appendInt(
updatedUserIds, userId); updatedUserIds, userId);
} }
@ -76,7 +76,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
// Propagate the permission flags. // Propagate the permission flags.
permissionsState.updatePermissionFlags(bp, userId, flags, flags); permissionsState.updatePermissionFlags(bp, userId, flags, flags);
} }
@@ -1421,7 +1435,7 @@ public class PermissionManagerService { @@ -1461,7 +1475,7 @@ public class PermissionManagerService {
&& (grantedPermissions == null && (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) { || ArrayUtils.contains(grantedPermissions, permission))) {
final int flags = permissionsState.getPermissionFlags(permission, userId); final int flags = permissionsState.getPermissionFlags(permission, userId);
@ -85,7 +85,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
// Installer cannot change immutable permissions. // Installer cannot change immutable permissions.
if ((flags & immutableFlags) == 0) { if ((flags & immutableFlags) == 0) {
grantRuntimePermission(permission, pkg.packageName, false, callingUid, grantRuntimePermission(permission, pkg.packageName, false, callingUid,
@@ -1480,7 +1494,7 @@ public class PermissionManagerService { @@ -1520,7 +1534,7 @@ public class PermissionManagerService {
// install permission's state is shared across all users. // install permission's state is shared across all users.
if (mSettings.mPermissionReviewRequired if (mSettings.mPermissionReviewRequired
&& pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
@ -94,7 +94,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
return; return;
} }
@@ -1516,7 +1530,8 @@ public class PermissionManagerService { @@ -1556,7 +1570,8 @@ public class PermissionManagerService {
+ permName + " for package " + packageName); + permName + " for package " + packageName);
} }
@ -104,7 +104,7 @@ index 79b2636481b3..9f1fe8a6414a 100644
Slog.w(TAG, "Cannot grant runtime permission to a legacy app"); Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
return; return;
} }
@@ -1601,7 +1616,8 @@ public class PermissionManagerService { @@ -1641,7 +1656,8 @@ public class PermissionManagerService {
// install permission's state is shared across all users. // install permission's state is shared across all users.
if (mSettings.mPermissionReviewRequired if (mSettings.mPermissionReviewRequired
&& pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M && pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M

4
Patches/LineageOS-17.1/android_frameworks_base/0014-Network_Permission-1.patch
View File

@ -22,10 +22,10 @@ index 586d9a819d1e..85e86237adf6 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 c0ae2274c38c..d34d672b825e 100644 index 011e19586ed2..245ea111996c 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
@@ -985,7 +985,7 @@ public class PermissionManagerService { @@ -1024,7 +1024,7 @@ public class PermissionManagerService {
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

4
Patches/LineageOS-17.1/android_frameworks_base/0014-Sensors_Permission.patch
View File

@ -100,10 +100,10 @@ index 2cf2b923ef90..ae206c1f5872 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 d34d672b825e..f348dbdb2778 100644 index 245ea111996c..4a940dbb7744 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
@@ -985,7 +985,7 @@ public class PermissionManagerService { @@ -1024,7 +1024,7 @@ public class PermissionManagerService {
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

20
Patches/LineageOS-17.1/android_frameworks_base/0014-Special_Permissions.patch
View File

@ -11,10 +11,10 @@ need to be granted by default for all apps to maintain compatibility.
2 files changed, 20 insertions(+), 6 deletions(-) 2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index cdab93c57179..a38da93e4aea 100644 index 1bd1396c6d45..a3e1b685a3be 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java --- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -20187,7 +20187,8 @@ public class PackageManagerService extends IPackageManager.Stub @@ -20185,7 +20185,8 @@ public class PackageManagerService extends IPackageManager.Stub
} }
// If this permission was granted by default, make sure it is. // If this permission was granted by default, make sure it is.
@ -25,10 +25,10 @@ index cdab93c57179..a38da93e4aea 100644
Process.SYSTEM_UID, userId, delayingPermCallback); Process.SYSTEM_UID, userId, delayingPermCallback);
// Allow app op later as we are holding mPackages // Allow app op later as we are holding mPackages
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 42ed16268919..c0ae2274c38c 100644 index 23af4e6c1c3e..011e19586ed2 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
@@ -984,6 +984,10 @@ public class PermissionManagerService { @@ -1023,6 +1023,10 @@ public class PermissionManagerService {
} }
} }
@ -39,7 +39,7 @@ index 42ed16268919..c0ae2274c38c 100644
/** /**
* Restore the permission state for a package. * Restore the permission state for a package.
* *
@@ -1283,6 +1287,14 @@ public class PermissionManagerService { @@ -1322,6 +1326,14 @@ public class PermissionManagerService {
} }
} }
} }
@ -54,7 +54,7 @@ index 42ed16268919..c0ae2274c38c 100644
} else { } else {
if (permState == null) { if (permState == null) {
// New permission // New permission
@@ -1416,7 +1428,7 @@ public class PermissionManagerService { @@ -1455,7 +1467,7 @@ public class PermissionManagerService {
wasChanged = true; wasChanged = true;
} }
} }
@ -63,7 +63,7 @@ index 42ed16268919..c0ae2274c38c 100644
if (!permissionsState.hasRuntimePermission(bp.name, userId) if (!permissionsState.hasRuntimePermission(bp.name, userId)
&& permissionsState.grantRuntimePermission(bp, && permissionsState.grantRuntimePermission(bp,
userId) != PERMISSION_OPERATION_FAILURE) { userId) != PERMISSION_OPERATION_FAILURE) {
@@ -2189,7 +2201,7 @@ public class PermissionManagerService { @@ -2228,7 +2240,7 @@ public class PermissionManagerService {
&& (grantedPermissions == null && (grantedPermissions == null
|| ArrayUtils.contains(grantedPermissions, permission))) { || ArrayUtils.contains(grantedPermissions, permission))) {
final int flags = permissionsState.getPermissionFlags(permission, userId); final int flags = permissionsState.getPermissionFlags(permission, userId);
@ -72,7 +72,7 @@ index 42ed16268919..c0ae2274c38c 100644
// Installer cannot change immutable permissions. // Installer cannot change immutable permissions.
if ((flags & immutableFlags) == 0) { if ((flags & immutableFlags) == 0) {
grantRuntimePermission(permission, pkg.packageName, false, callingUid, grantRuntimePermission(permission, pkg.packageName, false, callingUid,
@@ -2248,7 +2260,7 @@ public class PermissionManagerService { @@ -2287,7 +2299,7 @@ public class PermissionManagerService {
// to keep the review required permission flag per user while an // to keep the review required permission flag per user while an
// install permission's state is shared across all users. // install permission's state is shared across all users.
if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M
@ -81,7 +81,7 @@ index 42ed16268919..c0ae2274c38c 100644
return; return;
} }
@@ -2300,7 +2312,8 @@ public class PermissionManagerService { @@ -2339,7 +2351,8 @@ public class PermissionManagerService {
+ permName + " for package " + packageName); + permName + " for package " + packageName);
} }
@ -91,7 +91,7 @@ index 42ed16268919..c0ae2274c38c 100644
Slog.w(TAG, "Cannot grant runtime permission to a legacy app"); Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
return; return;
} }
@@ -2387,7 +2400,7 @@ public class PermissionManagerService { @@ -2426,7 +2439,7 @@ public class PermissionManagerService {
// to keep the review required permission flag per user while an // to keep the review required permission flag per user while an
// install permission's state is shared across all users. // install permission's state is shared across all users.
if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M if (pkg.applicationInfo.targetSdkVersion < Build.VERSION_CODES.M

2
Scripts/LineageOS-16.0/Functions.sh
View File

@ -87,7 +87,7 @@ patchWorkspace() {
repopick -it P_tzdata_2022; repopick -it P_tzdata_2022;
repopick -it P_asb_2022-11 -e 344200; repopick -it P_asb_2022-11 -e 344200;
repopick -it P_asb_2022-12 -e 345931; repopick -it P_asb_2022-12 -e 345931;
repopick -it P_asb_2023-01; repopick -it P_asb_2023-01 -e 347129;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

2
Scripts/LineageOS-16.0/Patch.sh
View File

@ -120,6 +120,8 @@ fi;
if enterAndClear "external/dtc"; then if enterAndClear "external/dtc"; then
git fetch https://github.com/LineageOS/android_external_dtc refs/changes/96/342096/1 && git cherry-pick FETCH_HEAD; #P_asb_2022-10 git fetch https://github.com/LineageOS/android_external_dtc refs/changes/96/342096/1 && git cherry-pick FETCH_HEAD; #P_asb_2022-10
git fetch https://github.com/LineageOS/android_external_dtc refs/changes/61/344161/1 && git cherry-pick FETCH_HEAD; #P_asb_2022-11
git fetch https://github.com/LineageOS/android_external_dtc refs/changes/91/345891/1 && git cherry-pick FETCH_HEAD; #P_asb_2022-12
fi; fi;
if enterAndClear "external/expat"; then if enterAndClear "external/expat"; then