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

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

+3 −4

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

	private static final String TAG = "ScreenshotHelper";		private static final String TAG = "ScreenshotHelper";

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



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