diff options
4 files changed, 12 insertions, 13 deletions
diff --git a/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java b/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java index 6c7f82a11..0d163cf55 100644 --- a/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java +++ b/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/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java b/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java index 90b1c4b6f..205ffc297 100644 --- a/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java +++ b/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/service/java/com/android/role/persistence/RolesPersistence.java b/service/java/com/android/role/persistence/RolesPersistence.java index 2908a3872..64d6545c8 100644 --- a/service/java/com/android/role/persistence/RolesPersistence.java +++ b/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/service/java/com/android/role/persistence/RolesPersistenceImpl.java b/service/java/com/android/role/persistence/RolesPersistenceImpl.java index 06fad77c4..3031c8213 100644 --- a/service/java/com/android/role/persistence/RolesPersistenceImpl.java +++ b/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(); } |