Merge "Make screenshot process unbind correctly" into rvc-qpr-dev (8a912c71) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/ScreenshotHelper.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -291,7 +291,7 @@ public class ScreenshotHelper {
		};

		Message msg = Message.obtain(null, screenshotType, screenshotRequest);
		final ServiceConnection myConn = mScreenshotConnection;

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

		try {
		messenger.send(msg);
		} catch (RemoteException e) {