Merge "Fix SysUI crash when locking while showing the Media Output Group dialog" into sc-v2-dev (d8b856ce) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
		}
		if (!mAdapter.isDragging() && !mAdapter.isAnimating()) {
		int currentActivePosition = mAdapter.getCurrentActivePosition();
		if (currentActivePosition >= 0) {
		if (currentActivePosition >= 0 && currentActivePosition < mAdapter.getItemCount()) {
		mAdapter.notifyItemChanged(currentActivePosition);
		} else {
		mAdapter.notifyDataSetChanged();

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+7 −23

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
		private final String mPackageName;
		private final Context mContext;
		private final MediaSessionManager mMediaSessionManager;
		private final LocalBluetoothManager mLocalBluetoothManager;
		private final ShadeController mShadeController;
		private final ActivityStarter mActivityStarter;
		private final DialogLaunchAnimator mDialogLaunchAnimator;
		@@ -85,7 +86,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
		private MediaController mMediaController;
		@VisibleForTesting
		Callback mCallback;
		Callback mPreviousCallback;
		@VisibleForTesting
		LocalMediaManager mLocalMediaManager;

		@@ -101,6 +101,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
		mContext = context;
		mPackageName = packageName;
		mMediaSessionManager = mediaSessionManager;
		mLocalBluetoothManager = lbm;
		mShadeController = shadeController;
		mActivityStarter = starter;
		mAboveStatusbar = aboveStatusbar;
		@@ -135,19 +136,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
		}
		return;
		}

		if (mPreviousCallback != null) {
		Log.w(TAG,
		"Callback started when mPreviousCallback is not null, which is unexpected");
		mPreviousCallback.dismissDialog();
		}

		// If we start the output group dialog when the output dialog is shown, we need to keep a
		// reference to the output dialog to set it back as the callback once we dismiss the output
		// group dialog.
		mPreviousCallback = mCallback;
		mCallback = cb;

		mLocalMediaManager.unregisterCallback(this);
		mLocalMediaManager.stopScan();
		mLocalMediaManager.registerCallback(this);
		@@ -163,15 +152,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
		mLocalMediaManager.stopScan();
		}
		mMediaDevices.clear();

		// If there was a previous callback, i.e. we just dismissed the output group dialog and are
		// now back on the output dialog, then we reset the callback to its previous value.
		mCallback = null;
		Callback previous = mPreviousCallback;
		mPreviousCallback = null;
		if (previous != null) {
		start(previous);
		}
		}

		@Override
		@@ -480,7 +460,11 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {

		void launchMediaOutputGroupDialog(View mediaOutputDialog) {
		// We show the output group dialog from the output dialog.
		MediaOutputGroupDialog dialog = new MediaOutputGroupDialog(mContext, mAboveStatusbar, this);
		MediaOutputController controller = new MediaOutputController(mContext, mPackageName,
		mAboveStatusbar, mMediaSessionManager, mLocalBluetoothManager, mShadeController,
		mActivityStarter, mNotificationEntryManager, mUiEventLogger, mDialogLaunchAnimator);
		MediaOutputGroupDialog dialog = new MediaOutputGroupDialog(mContext, mAboveStatusbar,
		controller);
		mDialogLaunchAnimator.showFromView(dialog, mediaOutputDialog);
		}