Merge "FocusRequester: fix NPE" (c7ed3e7e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/FocusRequester.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -437,7 +437,8 @@ public class FocusRequester {
		}

		int dispatchFocusChange(int focusChange) {
		if (mFocusDispatcher == null) {
		final IAudioFocusDispatcher fd = mFocusDispatcher;
		if (fd == null) {
		if (MediaFocusControl.DEBUG) { Log.e(TAG, "dispatchFocusChange: no focus dispatcher"); }
		return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
		}
		@@ -457,7 +458,7 @@ public class FocusRequester {
		mFocusLossReceived = focusChange;
		}
		try {
		mFocusDispatcher.dispatchAudioFocusChange(focusChange, mClientId);
		fd.dispatchAudioFocusChange(focusChange, mClientId);
		} catch (android.os.RemoteException e) {
		Log.e(TAG, "dispatchFocusChange: error talking to focus listener " + mClientId, e);
		return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
		@@ -466,16 +467,18 @@ public class FocusRequester {
		}

		void dispatchFocusResultFromExtPolicy(int requestResult) {
		if (mFocusDispatcher == null) {
		final IAudioFocusDispatcher fd = mFocusDispatcher;
		if (fd == null) {
		if (MediaFocusControl.DEBUG) {
		Log.e(TAG, "dispatchFocusResultFromExtPolicy: no focus dispatcher");
		}
		return;
		}
		if (DEBUG) {
		Log.v(TAG, "dispatching result" + requestResult + " to " + mClientId);
		}
		try {
		mFocusDispatcher.dispatchFocusResultFromExtPolicy(requestResult, mClientId);
		fd.dispatchFocusResultFromExtPolicy(requestResult, mClientId);
		} catch (android.os.RemoteException e) {
		Log.e(TAG, "dispatchFocusResultFromExtPolicy: error talking to focus listener"
		+ mClientId, e);