Move runtime permissions persistence into APEX.
Bug: 136503238
Test: presubmit
Change-Id: Id016d8c111ceadd27dc318c256b2f32ff0380f60
diff --git a/services/Android.bp b/services/Android.bp
index 5afed6c..914ea28 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -6,7 +6,7 @@
}
filegroup {
- name: "services-sources",
+ name: "services-stub-sources",
srcs: [
":services.core-sources",
":services.accessibility-sources",
@@ -29,6 +29,7 @@
":services.usage-sources",
":services.usb-sources",
":services.voiceinteraction-sources",
+ ":service-permission-sources",
],
visibility: ["//visibility:private"],
}
@@ -110,7 +111,7 @@
droidstubs {
name: "services-stubs.sources",
- srcs: [":services-sources"],
+ srcs: [":services-stub-sources"],
installable: false,
// TODO: remove the --hide options below
args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" +
diff --git a/services/api/current.txt b/services/api/current.txt
index 18e38b1..5ca0486 100644
--- a/services/api/current.txt
+++ b/services/api/current.txt
@@ -1,4 +1,31 @@
// Signature format: 2.0
+package com.android.permission.persistence {
+
+ public interface RuntimePermissionsPersistence {
+ method @NonNull public static com.android.permission.persistence.RuntimePermissionsPersistence createInstance();
+ method public void delete(@NonNull android.os.UserHandle);
+ method @Nullable public com.android.permission.persistence.RuntimePermissionsState read(@NonNull android.os.UserHandle);
+ method public void write(@NonNull com.android.permission.persistence.RuntimePermissionsState, @NonNull android.os.UserHandle);
+ }
+
+ public final class RuntimePermissionsState {
+ ctor public RuntimePermissionsState(int, @Nullable String, @NonNull java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>>, @NonNull java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>>);
+ method @Nullable public String getFingerprint();
+ method @NonNull public java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>> getPackagePermissions();
+ method @NonNull public java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>> getSharedUserPermissions();
+ method public int getVersion();
+ field public static final int NO_VERSION = -1; // 0xffffffff
+ }
+
+ public static class RuntimePermissionsState.PermissionState {
+ ctor public RuntimePermissionsState.PermissionState(@NonNull String, boolean, int);
+ method public int getFlags();
+ method @NonNull public String getName();
+ method public boolean isGranted();
+ }
+
+}
+
package com.android.server {
public abstract class SystemService {
diff --git a/services/core/Android.bp b/services/core/Android.bp
index b2fba73..02d4f94 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -90,6 +90,7 @@
],
libs: [
+ "services-stubs",
"services.net",
"android.hardware.light-V2.0-java",
"android.hardware.power-V1.0-java",
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 4f18cb4..5d948b2 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -92,6 +92,8 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.JournaledFile;
import com.android.internal.util.XmlUtils;
+import com.android.permission.persistence.RuntimePermissionsPersistence;
+import com.android.permission.persistence.RuntimePermissionsState;
import com.android.server.LocalServices;
import com.android.server.pm.Installer.InstallerException;
import com.android.server.pm.permission.BasePermission;
@@ -5096,6 +5098,9 @@
private static final int UPGRADE_VERSION = -1;
private static final int INITIAL_VERSION = 0;
+ private final RuntimePermissionsPersistence mPersistence =
+ RuntimePermissionsPersistence.createInstance();
+
private final Handler mHandler = new MyHandler();
private final Object mPersistenceLock;
@@ -5185,98 +5190,72 @@
}
private void writePermissionsSync(int userId) {
- AtomicFile destination = new AtomicFile(getUserRuntimePermissionsFile(userId),
- "package-perms-" + userId);
-
- ArrayMap<String, List<PermissionState>> permissionsForPackage = new ArrayMap<>();
- ArrayMap<String, List<PermissionState>> permissionsForSharedUser = new ArrayMap<>();
-
+ RuntimePermissionsState runtimePermissions;
synchronized (mPersistenceLock) {
mWriteScheduled.delete(userId);
- final int packageCount = mPackages.size();
- for (int i = 0; i < packageCount; i++) {
+ int version = mVersions.get(userId, INITIAL_VERSION);
+
+ String fingerprint = mFingerprints.get(userId);
+
+ Map<String, List<RuntimePermissionsState.PermissionState>> packagePermissions =
+ new ArrayMap<>();
+ int packagesSize = mPackages.size();
+ for (int i = 0; i < packagesSize; i++) {
String packageName = mPackages.keyAt(i);
PackageSetting packageSetting = mPackages.valueAt(i);
if (packageSetting.sharedUser == null) {
- PermissionsState permissionsState = packageSetting.getPermissionsState();
- List<PermissionState> permissionsStates = permissionsState
- .getRuntimePermissionStates(userId);
- if (!permissionsStates.isEmpty()) {
- permissionsForPackage.put(packageName, permissionsStates);
+ List<RuntimePermissionsState.PermissionState> permissions =
+ getPermissionsFromPermissionsState(
+ packageSetting.getPermissionsState(), userId);
+ if (permissions != null) {
+ packagePermissions.put(packageName, permissions);
}
}
}
- final int sharedUserCount = mSharedUsers.size();
- for (int i = 0; i < sharedUserCount; i++) {
+ Map<String, List<RuntimePermissionsState.PermissionState>> sharedUserPermissions =
+ new ArrayMap<>();
+ final int sharedUsersSize = mSharedUsers.size();
+ for (int i = 0; i < sharedUsersSize; i++) {
String sharedUserName = mSharedUsers.keyAt(i);
- SharedUserSetting sharedUser = mSharedUsers.valueAt(i);
- PermissionsState permissionsState = sharedUser.getPermissionsState();
- List<PermissionState> permissionsStates = permissionsState
- .getRuntimePermissionStates(userId);
- if (!permissionsStates.isEmpty()) {
- permissionsForSharedUser.put(sharedUserName, permissionsStates);
+ SharedUserSetting sharedUserSetting = mSharedUsers.valueAt(i);
+ List<RuntimePermissionsState.PermissionState> permissions =
+ getPermissionsFromPermissionsState(
+ sharedUserSetting.getPermissionsState(), userId);
+ if (permissions != null) {
+ sharedUserPermissions.put(sharedUserName, permissions);
}
}
+
+ runtimePermissions = new RuntimePermissionsState(version, fingerprint,
+ packagePermissions, sharedUserPermissions);
}
- FileOutputStream out = null;
- try {
- out = destination.startWrite();
+ mPersistence.write(runtimePermissions, UserHandle.of(userId));
+ }
- XmlSerializer serializer = Xml.newSerializer();
- serializer.setOutput(out, StandardCharsets.UTF_8.name());
- serializer.setFeature(
- "http://xmlpull.org/v1/doc/features.html#indent-output", true);
- serializer.startDocument(null, true);
-
- serializer.startTag(null, TAG_RUNTIME_PERMISSIONS);
-
- final int version = mVersions.get(userId, INITIAL_VERSION);
- serializer.attribute(null, ATTR_VERSION, Integer.toString(version));
-
- String fingerprint = mFingerprints.get(userId);
- if (fingerprint != null) {
- serializer.attribute(null, ATTR_FINGERPRINT, fingerprint);
- }
-
- final int packageCount = permissionsForPackage.size();
- for (int i = 0; i < packageCount; i++) {
- String packageName = permissionsForPackage.keyAt(i);
- List<PermissionState> permissionStates = permissionsForPackage.valueAt(i);
- serializer.startTag(null, TAG_PACKAGE);
- serializer.attribute(null, ATTR_NAME, packageName);
- writePermissions(serializer, permissionStates);
- serializer.endTag(null, TAG_PACKAGE);
- }
-
- final int sharedUserCount = permissionsForSharedUser.size();
- for (int i = 0; i < sharedUserCount; i++) {
- String packageName = permissionsForSharedUser.keyAt(i);
- List<PermissionState> permissionStates = permissionsForSharedUser.valueAt(i);
- serializer.startTag(null, TAG_SHARED_USER);
- serializer.attribute(null, ATTR_NAME, packageName);
- writePermissions(serializer, permissionStates);
- serializer.endTag(null, TAG_SHARED_USER);
- }
-
- serializer.endTag(null, TAG_RUNTIME_PERMISSIONS);
-
- serializer.endDocument();
- destination.finishWrite(out);
-
- if (Build.FINGERPRINT.equals(fingerprint)) {
- mDefaultPermissionsGranted.put(userId, true);
- }
- // Any error while writing is fatal.
- } catch (Throwable t) {
- Slog.wtf(PackageManagerService.TAG,
- "Failed to write settings, restoring backup", t);
- destination.failWrite(out);
- } finally {
- IoUtils.closeQuietly(out);
+ @Nullable
+ private List<RuntimePermissionsState.PermissionState> getPermissionsFromPermissionsState(
+ @NonNull PermissionsState permissionsState, @UserIdInt int userId) {
+ List<PermissionState> permissionStates = permissionsState.getRuntimePermissionStates(
+ userId);
+ if (permissionStates.isEmpty()) {
+ return null;
}
+
+ List<RuntimePermissionsState.PermissionState> permissions =
+ new ArrayList<>();
+ int permissionStatesSize = permissionStates.size();
+ for (int i = 0; i < permissionStatesSize; i++) {
+ PermissionState permissionState = permissionStates.get(i);
+
+ RuntimePermissionsState.PermissionState permission =
+ new RuntimePermissionsState.PermissionState(permissionState.getName(),
+ permissionState.isGranted(), permissionState.getFlags());
+ permissions.add(permission);
+ }
+ return permissions;
}
@GuardedBy("Settings.this.mLock")
@@ -5311,11 +5290,88 @@
}
public void deleteUserRuntimePermissionsFile(int userId) {
- getUserRuntimePermissionsFile(userId).delete();
+ mPersistence.delete(UserHandle.of(userId));
}
@GuardedBy("Settings.this.mLock")
public void readStateForUserSyncLPr(int userId) {
+ RuntimePermissionsState runtimePermissions = mPersistence.read(UserHandle.of(userId));
+ if (runtimePermissions == null) {
+ readLegacyStateForUserSyncLPr(userId);
+ writePermissionsForUserAsyncLPr(userId);
+ return;
+ }
+
+ // If the runtime permissions file exists but the version is not set this is
+ // an upgrade from P->Q. Hence mark it with the special UPGRADE_VERSION.
+ int version = runtimePermissions.getVersion();
+ if (version == RuntimePermissionsState.NO_VERSION) {
+ version = UPGRADE_VERSION;
+ }
+ mVersions.put(userId, version);
+
+ String fingerprint = runtimePermissions.getFingerprint();
+ mFingerprints.put(userId, fingerprint);
+ boolean defaultPermissionsGranted = Build.FINGERPRINT.equals(fingerprint);
+ mDefaultPermissionsGranted.put(userId, defaultPermissionsGranted);
+
+ for (Map.Entry<String, List<RuntimePermissionsState.PermissionState>> entry
+ : runtimePermissions.getPackagePermissions().entrySet()) {
+ String packageName = entry.getKey();
+ List<RuntimePermissionsState.PermissionState> permissions = entry.getValue();
+
+ PackageSetting packageSetting = mPackages.get(packageName);
+ if (packageSetting == null) {
+ Slog.w(PackageManagerService.TAG, "Unknown package:" + packageName);
+ continue;
+ }
+ readPermissionsStateLpr(permissions, packageSetting.getPermissionsState(), userId);
+ }
+
+ for (Map.Entry<String, List<RuntimePermissionsState.PermissionState>> entry
+ : runtimePermissions.getSharedUserPermissions().entrySet()) {
+ String sharedUserName = entry.getKey();
+ List<RuntimePermissionsState.PermissionState> permissions = entry.getValue();
+
+ SharedUserSetting sharedUserSetting = mSharedUsers.get(sharedUserName);
+ if (sharedUserSetting == null) {
+ Slog.w(PackageManagerService.TAG, "Unknown shared user:" + sharedUserName);
+ continue;
+ }
+ readPermissionsStateLpr(permissions, sharedUserSetting.getPermissionsState(),
+ userId);
+ }
+ }
+
+ private void readPermissionsStateLpr(
+ @NonNull List<RuntimePermissionsState.PermissionState> permissions,
+ @NonNull PermissionsState permissionsState, @UserIdInt int userId) {
+ int permissionsSize = permissions.size();
+ for (int i = 0; i < permissionsSize; i++) {
+ RuntimePermissionsState.PermissionState permission = permissions.get(i);
+
+ String name = permission.getName();
+ BasePermission basePermission = mPermissions.getPermission(name);
+ if (basePermission == null) {
+ Slog.w(PackageManagerService.TAG, "Unknown permission:" + name);
+ continue;
+ }
+ boolean granted = permission.isGranted();
+ int flags = permission.getFlags();
+
+ if (granted) {
+ permissionsState.grantRuntimePermission(basePermission, userId);
+ permissionsState.updatePermissionFlags(basePermission, userId,
+ PackageManager.MASK_PERMISSION_FLAGS_ALL, flags);
+ } else {
+ permissionsState.updatePermissionFlags(basePermission, userId,
+ PackageManager.MASK_PERMISSION_FLAGS_ALL, flags);
+ }
+ }
+ }
+
+ @GuardedBy("Settings.this.mLock")
+ private void readLegacyStateForUserSyncLPr(int userId) {
File permissionsFile = getUserRuntimePermissionsFile(userId);
if (!permissionsFile.exists()) {
return;
@@ -5435,19 +5491,6 @@
}
}
- private void writePermissions(XmlSerializer serializer,
- List<PermissionState> permissionStates) throws IOException {
- for (PermissionState permissionState : permissionStates) {
- serializer.startTag(null, TAG_ITEM);
- serializer.attribute(null, ATTR_NAME,permissionState.getName());
- serializer.attribute(null, ATTR_GRANTED,
- String.valueOf(permissionState.isGranted()));
- serializer.attribute(null, ATTR_FLAGS,
- Integer.toHexString(permissionState.getFlags()));
- serializer.endTag(null, TAG_ITEM);
- }
- }
-
private final class MyHandler extends Handler {
public MyHandler() {
super(BackgroundThread.getHandler().getLooper());