Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 (022a8216) · Commits · e / os / android_frameworks_base

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

+3 −4

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

		private static final String TAG = "ScreenshotHelper";

		// Time until we give up on the screenshot & show an error instead.
		@@ -146,8 +147,6 @@ public class ScreenshotHelper {
		mContext = context;
		}



		/**
		* Request a screenshot be taken.
		*
		@@ -284,8 +283,8 @@ public class ScreenshotHelper {
		break;
		case SCREENSHOT_MSG_PROCESS_COMPLETE:
		synchronized (mScreenshotLock) {
		if (mScreenshotConnection == myConn) {
		mContext.unbindService(mScreenshotConnection);
		if (myConn != null && mScreenshotConnection == myConn) {
		mContext.unbindService(myConn);
		mScreenshotConnection = null;
		mScreenshotService = null;
		}