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

Merge "Make screenshot process unbind correctly" into rvc-qpr-dev am: 8a912c716b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087986

Change-Id: I63421e3e9672afb61842b75e9cc7a476cc3fb532
This commit is contained in:
Miranda Kephart
2020-08-11 18:20:46 +00:00
committed by Automerger Merge Worker
parent c421452ce8 8a912c716b
commit bebfed8bbf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/util/ScreenshotHelper.java
View File

@@ -291,7 +291,7 @@ public class ScreenshotHelper {
}; };
Message msg = Message.obtain(null, screenshotType, screenshotRequest); Message msg = Message.obtain(null, screenshotType, screenshotRequest);
final ServiceConnection myConn = mScreenshotConnection;
Handler h = new Handler(handler.getLooper()) { Handler h = new Handler(handler.getLooper()) {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
@@ -304,8 +304,8 @@ public class ScreenshotHelper {
break; break;
case SCREENSHOT_MSG_PROCESS_COMPLETE: case SCREENSHOT_MSG_PROCESS_COMPLETE:
synchronized (mScreenshotLock) { synchronized (mScreenshotLock) {
if (myConn != null && mScreenshotConnection == myConn) { if (mScreenshotConnection != null) {
mContext.unbindService(myConn); mContext.unbindService(mScreenshotConnection);
mScreenshotConnection = null; mScreenshotConnection = null;
mScreenshotService = null; mScreenshotService = null;
} }
@@ -368,6 +368,7 @@ public class ScreenshotHelper {
} }
} else { } else {
Messenger messenger = new Messenger(mScreenshotService); Messenger messenger = new Messenger(mScreenshotService);
try { try {
messenger.send(msg); messenger.send(msg);
} catch (RemoteException e) { } catch (RemoteException e) {