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

Merge "Close AppSearchImpl in handling user removed broadcast." into sc-dev

Browse Source
This commit is contained in:
Terry Wang
2021-06-15 00:42:21 +00:00
committed by Android (Google) Code Review
parent 263fe8886e a3d8ce430c
commit aca6fae8b2
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/appsearch/service/java/com/android/server/appsearch/AppSearchManagerService.java
View File

@@ -179,7 +179,7 @@ public class AppSearchManagerService extends SystemService {
*/ */
private void handleUserRemoved(@NonNull UserHandle userHandle) { private void handleUserRemoved(@NonNull UserHandle userHandle) {
try { try {
mImplInstanceManager.removeAppSearchImplForUser(userHandle); mImplInstanceManager.closeAndRemoveAppSearchImplForUser(userHandle);
mLoggerInstanceManager.removePlatformLoggerForUser(userHandle); mLoggerInstanceManager.removePlatformLoggerForUser(userHandle);
Log.i(TAG, "Removed AppSearchImpl instance for: " + userHandle); Log.i(TAG, "Removed AppSearchImpl instance for: " + userHandle);
} catch (Throwable t) { } catch (Throwable t) {

19
apex/appsearch/service/java/com/android/server/appsearch/ImplInstanceManager.java
View File

@@ -103,25 +103,6 @@ public final class ImplInstanceManager {
} }
} }
/**
* Remove an instance of {@link AppSearchImpl} for the given user.
*
* <p>This method should only be called if {@link AppSearchManagerService} receives an
* ACTION_USER_REMOVED, which the instance of given user should be removed.
*
* <p>If the user is removed, the "credential encrypted" system directory where icing lives will
* be auto-deleted. So we shouldn't worry about persist data or close the AppSearchImpl.
*
* @param userHandle The multi-user user handle of the user that need to be removed.
*/
public void removeAppSearchImplForUser(@NonNull UserHandle userHandle) {
Objects.requireNonNull(userHandle);
synchronized (mInstancesLocked) {
// no need to close and persist data to disk since we are removing them now.
mInstancesLocked.remove(userHandle);
}
}
/** /**
* Close and remove an instance of {@link AppSearchImpl} for the given user. * Close and remove an instance of {@link AppSearchImpl} for the given user.
* *