Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename permission APIs.

Browse Source 
According to lint warnings.

Bug: 136503238
Fixes: 149818284
Test: presubmit
Change-Id: I83e9ac9b65e307bb47d305003ce7adcd2b9c4049
This commit is contained in:
Hai Zhang
2020-02-19 10:36:14 -08:00
parent 5263c11a4c
commit 5ce0b1adcb
8 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java
View File

@@ -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.

6
apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistenceImpl.java
View File

@@ -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();
}

6
apex/permission/service/java/com/android/role/persistence/RolesPersistence.java
View File

@@ -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.

7
apex/permission/service/java/com/android/role/persistence/RolesPersistenceImpl.java
View File

@@ -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();
}

12
services/api/current.txt
View File

@@ -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 {

14
services/api/lint-baseline.txt
View File

@@ -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`

7
services/core/java/com/android/server/pm/Settings.java
View File

@@ -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);

6
services/core/java/com/android/server/role/RoleUserState.java
View File

@@ -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;
}
}