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

Merge "Remove ContentCaptureServerSession when app died." into qt-dev

Browse Source 
am: 094b9acb0d

Change-Id: I4a211d7005e2d9e4c4abc63f24d37f84e31df96b
This commit is contained in:
Felipe Leme
2019-04-18 12:45:29 -07:00
committed by android-build-merger
parent 2e6bb9db6a 094b9acb0d
commit 11c6dfd0af
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
View File

@@ -313,7 +313,7 @@ final class ContentCapturePerUserService
// Make sure service is bound, just in case the initial connection failed somehow
mRemoteService.ensureBoundLocked();
final ContentCaptureServerSession newSession = new ContentCaptureServerSession(
final ContentCaptureServerSession newSession = new ContentCaptureServerSession(mLock,
activityToken, this, componentName, clientReceiver, taskId, displayId, sessionId,
uid, flags);
if (mMaster.verbose) {

23
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java
View File

@@ -65,11 +65,14 @@ final class ContentCaptureServerSession {
*/
private final int mUid;
ContentCaptureServerSession(@NonNull IBinder activityToken,
private final Object mLock;
ContentCaptureServerSession(@NonNull Object lock, @NonNull IBinder activityToken,
@NonNull ContentCapturePerUserService service, @NonNull ComponentName appComponentName,
@NonNull IResultReceiver sessionStateReceiver, int taskId, int displayId, int sessionId,
int uid, int flags) {
Preconditions.checkArgument(sessionId != NO_SESSION_ID);
mLock = lock;
mActivityToken = activityToken;
mService = service;
mId = sessionId;
@@ -77,6 +80,11 @@ final class ContentCaptureServerSession {
mContentCaptureContext = new ContentCaptureContext(/* clientContext= */ null,
appComponentName, taskId, displayId, flags);
mSessionStateReceiver = sessionStateReceiver;
try {
sessionStateReceiver.asBinder().linkToDeath(() -> onClientDeath(), 0);
} catch (Exception e) {
Slog.w(TAG, "could not register DeathRecipient for " + activityToken);
}
}
/**
@@ -182,6 +190,19 @@ final class ContentCaptureServerSession {
/* binder= */ null);
}
/**
* Called when the session client binder object died - typically when its process was killed
* and the activity was not properly destroyed.
*/
private void onClientDeath() {
if (mService.isVerbose()) {
Slog.v(TAG, "onClientDeath(" + mActivityToken + "): removing session " + mId);
}
synchronized (mLock) {
removeSelfLocked(/* notifyRemoteService= */ true);
}
}
@GuardedBy("mLock")
public void dumpLocked(@NonNull String prefix, @NonNull PrintWriter pw) {
pw.print(prefix); pw.print("id: "); pw.print(mId); pw.println();