diff options
8 files changed, 25 insertions, 39 deletions
diff --git a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java index 6c7f82a11908..0d163cf55e4e 100644 --- a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java +++ b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java @@ -40,7 +40,7 @@ public interface RuntimePermissionsPersistence { * @return the runtime permissions read */ @Nullable - RuntimePermissionsState read(@NonNull UserHandle user); + RuntimePermissionsState readAsUser(@NonNull UserHandle user); /** * Write the runtime permissions to persistence. @@ -50,7 +50,7 @@ public interface RuntimePermissionsPersistence { * @param runtimePermissions the runtime permissions to write * @param user the user to write for */ - void write(@NonNull RuntimePermissionsState runtimePermissions, @NonNull UserHandle user); + void writeAsUser(@NonNull RuntimePermissionsState runtimePermissions, @NonNull UserHandle user); /** * Delete the runtime permissions from persistence. @@ -59,7 +59,7 @@ public interface RuntimePermissionsPersistence { * * @param user the user to delete for */ - void delete(@NonNull UserHandle user); + void deleteAsUser(@NonNull UserHandle user); /** * Create a new instance of {@link RuntimePermissionsPersistence} implementation. diff --git a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java index 90b1c4b6ff5f..205ffc297945 100644 --- a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java +++ b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java @@ -67,7 +67,7 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers @Nullable @Override - public RuntimePermissionsState read(@NonNull UserHandle user) { + public RuntimePermissionsState readAsUser(@NonNull UserHandle user) { File file = getFile(user); try (FileInputStream inputStream = new AtomicFile(file).openRead()) { XmlPullParser parser = Xml.newPullParser(); @@ -172,7 +172,7 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers } @Override - public void write(@NonNull RuntimePermissionsState runtimePermissions, + public void writeAsUser(@NonNull RuntimePermissionsState runtimePermissions, @NonNull UserHandle user) { File file = getFile(user); AtomicFile atomicFile = new AtomicFile(file); @@ -252,7 +252,7 @@ public class RuntimePermissionsPersistenceImpl implements RuntimePermissionsPers } @Override - public void delete(@NonNull UserHandle user) { + public void deleteAsUser(@NonNull UserHandle user) { getFile(user).delete(); } diff --git a/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java b/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java index 2908a3872df9..64d6545c87cf 100644 --- a/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java +++ b/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java @@ -40,7 +40,7 @@ public interface RolesPersistence { * @return the roles read */ @Nullable - RolesState read(@NonNull UserHandle user); + RolesState readAsUser(@NonNull UserHandle user); /** * Write the roles to persistence. @@ -50,7 +50,7 @@ public interface RolesPersistence { * @param roles the roles to write * @param user the user to write for */ - void write(@NonNull RolesState roles, @NonNull UserHandle user); + void writeAsUser(@NonNull RolesState roles, @NonNull UserHandle user); /** * Delete the roles from persistence. @@ -59,7 +59,7 @@ public interface RolesPersistence { * * @param user the user to delete for */ - void delete(@NonNull UserHandle user); + void deleteAsUser(@NonNull UserHandle user); /** * Create a new instance of {@link RolesPersistence} implementation. diff --git a/apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java b/apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java index 06fad77c495c..3031c8213982 100644 --- a/apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java +++ b/apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java @@ -65,7 +65,7 @@ public class RolesPersistenceImpl implements RolesPersistence { @Nullable @Override - public RolesState read(@NonNull UserHandle user) { + public RolesState readAsUser(@NonNull UserHandle user) { File file = getFile(user); try (FileInputStream inputStream = new AtomicFile(file).openRead()) { XmlPullParser parser = Xml.newPullParser(); @@ -146,8 +146,7 @@ public class RolesPersistenceImpl implements RolesPersistence { } @Override - public void write(@NonNull RolesState roles, - @NonNull UserHandle user) { + public void writeAsUser(@NonNull RolesState roles, @NonNull UserHandle user) { File file = getFile(user); AtomicFile atomicFile = new AtomicFile(file); FileOutputStream outputStream = null; @@ -206,7 +205,7 @@ public class RolesPersistenceImpl implements RolesPersistence { } @Override - public void delete(@NonNull UserHandle user) { + public void deleteAsUser(@NonNull UserHandle user) { getFile(user).delete(); } diff --git a/services/api/current.txt b/services/api/current.txt index 8a82e610c233..26a65f21ed83 100644 --- a/services/api/current.txt +++ b/services/api/current.txt @@ -3,9 +3,9 @@ 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); + method public void deleteAsUser(@NonNull android.os.UserHandle); + method @Nullable public com.android.permission.persistence.RuntimePermissionsState readAsUser(@NonNull android.os.UserHandle); + method public void writeAsUser(@NonNull com.android.permission.persistence.RuntimePermissionsState, @NonNull android.os.UserHandle); } public final class RuntimePermissionsState { @@ -30,9 +30,9 @@ package com.android.role.persistence { public interface RolesPersistence { method @NonNull public static com.android.role.persistence.RolesPersistence createInstance(); - method public void delete(@NonNull android.os.UserHandle); - method @Nullable public com.android.role.persistence.RolesState read(@NonNull android.os.UserHandle); - method public void write(@NonNull com.android.role.persistence.RolesState, @NonNull android.os.UserHandle); + method public void deleteAsUser(@NonNull android.os.UserHandle); + method @Nullable public com.android.role.persistence.RolesState readAsUser(@NonNull android.os.UserHandle); + method public void writeAsUser(@NonNull com.android.role.persistence.RolesState, @NonNull android.os.UserHandle); } public final class RolesState { diff --git a/services/api/lint-baseline.txt b/services/api/lint-baseline.txt index 0b8658cf469d..7e7441fce5c3 100644 --- a/services/api/lint-baseline.txt +++ b/services/api/lint-baseline.txt @@ -19,17 +19,3 @@ ProtectedMember: com.android.server.SystemService#publishBinderService(String, a Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder)} ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder, boolean): Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder,boolean)} - - -UserHandleName: com.android.permission.persistence.RuntimePermissionsPersistence#delete(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `delete` -UserHandleName: com.android.permission.persistence.RuntimePermissionsPersistence#read(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `read` -UserHandleName: com.android.permission.persistence.RuntimePermissionsPersistence#write(com.android.permission.persistence.RuntimePermissionsState, android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `write` -UserHandleName: com.android.role.persistence.RolesPersistence#delete(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `delete` -UserHandleName: com.android.role.persistence.RolesPersistence#read(android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `read` -UserHandleName: com.android.role.persistence.RolesPersistence#write(com.android.role.persistence.RolesState, android.os.UserHandle): - Method taking UserHandle should be named `doFooAsUser` or `queryFooForUser`, was `write` diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 60c8b949ec52..382d690e5a1d 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -5403,7 +5403,7 @@ public final class Settings { packagePermissions, sharedUserPermissions); } - mPersistence.write(runtimePermissions, UserHandle.of(userId)); + mPersistence.writeAsUser(runtimePermissions, UserHandle.of(userId)); } @NonNull @@ -5457,12 +5457,13 @@ public final class Settings { } public void deleteUserRuntimePermissionsFile(int userId) { - mPersistence.delete(UserHandle.of(userId)); + mPersistence.deleteAsUser(UserHandle.of(userId)); } @GuardedBy("Settings.this.mLock") public void readStateForUserSyncLPr(int userId) { - RuntimePermissionsState runtimePermissions = mPersistence.read(UserHandle.of(userId)); + RuntimePermissionsState runtimePermissions = mPersistence.readAsUser(UserHandle.of( + userId)); if (runtimePermissions == null) { readLegacyStateForUserSyncLPr(userId); writePermissionsForUserAsyncLPr(userId); diff --git a/services/core/java/com/android/server/role/RoleUserState.java b/services/core/java/com/android/server/role/RoleUserState.java index 9f4ca3c6c4ea..97ce6bd7f369 100644 --- a/services/core/java/com/android/server/role/RoleUserState.java +++ b/services/core/java/com/android/server/role/RoleUserState.java @@ -364,12 +364,12 @@ public class RoleUserState { (Map<String, Set<String>>) (Map<String, ?>) snapshotRolesLocked()); } - mPersistence.write(roles, UserHandle.of(mUserId)); + mPersistence.writeAsUser(roles, UserHandle.of(mUserId)); } private void readFile() { synchronized (mLock) { - RolesState roles = mPersistence.read(UserHandle.of(mUserId)); + RolesState roles = mPersistence.readAsUser(UserHandle.of(mUserId)); if (roles == null) { readLegacyFileLocked(); scheduleWriteFileLocked(); @@ -545,7 +545,7 @@ public class RoleUserState { throw new IllegalStateException("This RoleUserState has already been destroyed"); } mWriteHandler.removeCallbacksAndMessages(null); - mPersistence.delete(UserHandle.of(mUserId)); + mPersistence.deleteAsUser(UserHandle.of(mUserId)); mDestroyed = true; } } |