mirror of
https://github.com/ponces/treble_aosp.git
synced 2025-05-08 16:37:35 +00:00
74 lines
4.0 KiB
Diff
74 lines
4.0 KiB
Diff
From f377672ac9de754e23d8218bee37a678c7f127a4 Mon Sep 17 00:00:00 2001
|
|
From: Luca Stefani <luca.stefani.ge1@gmail.com>
|
|
Date: Mon, 18 Nov 2024 21:24:57 +0100
|
|
Subject: [PATCH 2/8] Make default permissions updates tied to version
|
|
incremental
|
|
|
|
Otherwise adding new rules won't have any effect for us.
|
|
|
|
Change-Id: Ib81082a184956ea550bdccdbdf53b2b4cc48f487
|
|
---
|
|
.../com/android/server/pm/PackageManagerService.java | 10 ++++++----
|
|
.../pm/permission/PermissionManagerServiceImpl.java | 3 ++-
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
|
|
index 8b0c4f42b..6c6cd6898 100644
|
|
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
|
|
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
|
|
@@ -4283,7 +4283,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
|
|
final int userId = livingUsers.get(i).id;
|
|
final boolean isPermissionUpgradeNeeded = !Objects.equals(
|
|
mPermissionManager.getDefaultPermissionGrantFingerprint(userId),
|
|
- Build.FINGERPRINT);
|
|
+ Build.VERSION.INCREMENTAL);
|
|
if (isPermissionUpgradeNeeded) {
|
|
grantPermissionsUserIds = ArrayUtils.appendInt(
|
|
grantPermissionsUserIds, userId);
|
|
@@ -4292,7 +4292,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService
|
|
// If we upgraded grant all default permissions before kicking off.
|
|
for (int userId : grantPermissionsUserIds) {
|
|
mLegacyPermissionManager.grantDefaultPermissions(userId);
|
|
- mPermissionManager.setDefaultPermissionGrantFingerprint(Build.FINGERPRINT, userId);
|
|
+ mPermissionManager.setDefaultPermissionGrantFingerprint(
|
|
+ Build.VERSION.INCREMENTAL, userId);
|
|
}
|
|
if (grantPermissionsUserIds == EMPTY_INT_ARRAY) {
|
|
// If we did not grant default permissions, we preload from this the
|
|
@@ -4478,7 +4479,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService
|
|
if (!convertedFromPreCreated || !readPermissionStateForUser(userId)) {
|
|
mPermissionManager.onUserCreated(userId);
|
|
mLegacyPermissionManager.grantDefaultPermissions(userId);
|
|
- mPermissionManager.setDefaultPermissionGrantFingerprint(Build.FINGERPRINT, userId);
|
|
+ mPermissionManager.setDefaultPermissionGrantFingerprint(
|
|
+ Build.VERSION.INCREMENTAL, userId);
|
|
mDomainVerificationManager.clearUser(userId);
|
|
}
|
|
}
|
|
@@ -4490,7 +4492,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
|
|
mPermissionManager.readLegacyPermissionStateTEMP();
|
|
final boolean isPermissionUpgradeNeeded = !Objects.equals(
|
|
mPermissionManager.getDefaultPermissionGrantFingerprint(userId),
|
|
- Build.FINGERPRINT);
|
|
+ Build.VERSION.INCREMENTAL);
|
|
return isPermissionUpgradeNeeded;
|
|
}
|
|
}
|
|
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
|
|
index ea71953d7..b420e29d8 100644
|
|
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
|
|
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
|
|
@@ -4644,7 +4644,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
|
|
@Nullable
|
|
@Override
|
|
public String getDefaultPermissionGrantFingerprint(@UserIdInt int userId) {
|
|
- return mPackageManagerInt.isPermissionUpgradeNeeded(userId) ? null : Build.FINGERPRINT;
|
|
+ return mPackageManagerInt.isPermissionUpgradeNeeded(userId)
|
|
+ ? null : Build.VERSION.INCREMENTAL;
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.34.1
|
|
|