Merge "Fix the art work of lockscreen cannot be removed" into pi-dev (fbed7eba) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java

+25 −20

Original line number	Diff line number	Diff line
		@@ -172,27 +172,28 @@ public class NotificationMediaManager implements Dumpable {
		}
		}

		if (mediaNotification != null) {
		mMediaNotificationKey = mediaNotification.notification.getKey();
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Found new media notification: key="
		+ mMediaNotificationKey + " controller=" + mMediaController);
		}
		}

		if (controller != null && !sameSessions(mMediaController, controller)) {
		// We have a new media session
		clearCurrentMediaNotification();
		clearCurrentMediaNotificationSession();
		mMediaController = controller;
		mMediaController.registerCallback(mMediaListener);
		mMediaMetadata = mMediaController.getMetadata();
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: insert listener, receive metadata: "
		+ mMediaMetadata);
		Log.v(TAG, "DEBUG_MEDIA: insert listener, found new controller: "
		+ mMediaController + ", receive metadata: " + mMediaMetadata);
		}

		metaDataChanged = true;
		}

		if (mediaNotification != null
		&& !mediaNotification.notification.getKey().equals(mMediaNotificationKey)) {
		mMediaNotificationKey = mediaNotification.notification.getKey();
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Found new media notification: key="
		+ mMediaNotificationKey);
		}
		}
		}

		if (metaDataChanged) {
		@@ -203,15 +204,7 @@ public class NotificationMediaManager implements Dumpable {

		public void clearCurrentMediaNotification() {
		mMediaNotificationKey = null;
		mMediaMetadata = null;
		if (mMediaController != null) {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Disconnecting from old controller: "
		+ mMediaController.getPackageName());
		}
		mMediaController.unregisterCallback(mMediaListener);
		}
		mMediaController = null;
		clearCurrentMediaNotificationSession();
		}

		@Override
		@@ -265,4 +258,16 @@ public class NotificationMediaManager implements Dumpable {
		entry.getExpandedContentView()
		.findViewById(com.android.internal.R.id.media_actions) != null;
		}

		private void clearCurrentMediaNotificationSession() {
		mMediaMetadata = null;
		if (mMediaController != null) {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Disconnecting from old controller: "
		+ mMediaController.getPackageName());
		}
		mMediaController.unregisterCallback(mMediaListener);
		}
		mMediaController = null;
		}
		}