Merge "Rename permission APIs." (1040a5c1) · Commits · e / os / android_frameworks_base

apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.

apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}

apex/permission/service/java/com/android/role/persistence/RolesPersistence.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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.

apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -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();
		}

services/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -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 {