Merge "Added null checks for NPE on mSystemServerInterface" (58611544) · Commits · e / os / android_frameworks_base

core/java/android/view/contentcapture/MainContentCaptureSession.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -199,6 +199,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	final int flags = 0; // TODO(b/111276913): get proper flags		final int flags = 0; // TODO(b/111276913): get proper flags

	try {		try {
			if (mSystemServerInterface == null) return;

	mSystemServerInterface.startSession(mContext.getUserId(), mApplicationToken,		mSystemServerInterface.startSession(mContext.getUserId(), mApplicationToken,
	componentName, mId, flags, new IResultReceiver.Stub() {		componentName, mId, flags, new IResultReceiver.Stub() {
	@Override		@Override
	@@ -383,6 +385,8 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
	}		}

	try {		try {
			if (mSystemServerInterface == null) return;

	mSystemServerInterface.finishSession(mContext.getUserId(), mId);		mSystemServerInterface.finishSession(mContext.getUserId(), mId);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error destroying system-service session " + mId + " for "		Log.e(TAG, "Error destroying system-service session " + mId + " for "