Merge "No need to fetch bitmap in NMM" into main (4d31912a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/MediaArtworkProcessor.kt

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License
		*/

		package com.android.systemui.statusbar

		import android.content.Context
		import android.graphics.Bitmap
		import android.graphics.Canvas
		import android.graphics.Point
		import android.graphics.Rect
		import android.renderscript.Allocation
		import android.renderscript.Element
		import android.renderscript.RenderScript
		import android.renderscript.ScriptIntrinsicBlur
		import android.util.Log
		import android.util.MathUtils
		import com.android.internal.graphics.ColorUtils
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.statusbar.notification.MediaNotificationProcessor
		import javax.inject.Inject

		private const val TAG = "MediaArtworkProcessor"
		private const val COLOR_ALPHA = (255 * 0.7f).toInt()
		private const val BLUR_RADIUS = 25f
		private const val DOWNSAMPLE = 6

		@SysUISingleton
		class MediaArtworkProcessor @Inject constructor() {

		private val mTmpSize = Point()
		private var mArtworkCache: Bitmap? = null

		fun processArtwork(context: Context, artwork: Bitmap): Bitmap? {
		if (mArtworkCache != null) {
		return mArtworkCache
		}
		val renderScript = RenderScript.create(context)
		val blur = ScriptIntrinsicBlur.create(renderScript, Element.U8_4(renderScript))
		var input: Allocation? = null
		var output: Allocation? = null
		var inBitmap: Bitmap? = null
		try {
		@Suppress("DEPRECATION")
		context.display?.getSize(mTmpSize)
		val rect = Rect(0, 0, artwork.width, artwork.height)
		MathUtils.fitRect(rect, Math.max(mTmpSize.x / DOWNSAMPLE, mTmpSize.y / DOWNSAMPLE))
		inBitmap = Bitmap.createScaledBitmap(artwork, rect.width(), rect.height(),
		true /* filter */)
		// Render script blurs only support ARGB_8888, we need a conversion if we got a
		// different bitmap config.
		if (inBitmap.config != Bitmap.Config.ARGB_8888) {
		val oldIn = inBitmap
		inBitmap = oldIn.copy(Bitmap.Config.ARGB_8888, false /* isMutable */)
		oldIn.recycle()
		}
		val outBitmap = Bitmap.createBitmap(inBitmap?.width ?: 0, inBitmap?.height ?: 0,
		Bitmap.Config.ARGB_8888)

		input = Allocation.createFromBitmap(renderScript, inBitmap,
		Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_GRAPHICS_TEXTURE)
		output = Allocation.createFromBitmap(renderScript, outBitmap)

		blur.setRadius(BLUR_RADIUS)
		blur.setInput(input)
		blur.forEach(output)
		output.copyTo(outBitmap)

		val swatch = MediaNotificationProcessor.findBackgroundSwatch(artwork)

		val canvas = Canvas(outBitmap)
		canvas.drawColor(ColorUtils.setAlphaComponent(swatch.rgb, COLOR_ALPHA))
		return outBitmap
		} catch (ex: IllegalArgumentException) {
		Log.e(TAG, "error while processing artwork", ex)
		return null
		} finally {
		input?.destroy()
		output?.destroy()
		blur.destroy()
		inBitmap?.recycle()
		}
		}

		fun clearCache() {
		mArtworkCache?.recycle()
		mArtworkCache = null
		}
		}
		No newline at end of file

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

+5 −266

Original line number	Diff line number	Diff line
		@@ -15,43 +15,29 @@
		*/
		package com.android.systemui.statusbar;

		import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
		import static com.android.systemui.statusbar.phone.CentralSurfaces.DEBUG_MEDIA_FAKE_ARTWORK;
		import static com.android.systemui.statusbar.phone.CentralSurfaces.ENABLE_LOCKSCREEN_WALLPAPER;
		import static com.android.systemui.statusbar.phone.CentralSurfaces.SHOW_LOCKSCREEN_MEDIA_ARTWORK;

		import android.annotation.MainThread;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.Notification;
		import android.app.WallpaperManager;
		import android.content.Context;
		import android.graphics.Bitmap;
		import android.graphics.Point;
		import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.Icon;
		import android.hardware.display.DisplayManager;
		import android.media.MediaMetadata;
		import android.media.session.MediaController;
		import android.media.session.MediaSession;
		import android.media.session.PlaybackState;
		import android.os.AsyncTask;
		import android.os.Trace;
		import android.service.notification.NotificationStats;
		import android.service.notification.StatusBarNotification;
		import android.util.ArraySet;
		import android.util.Log;
		import android.view.Display;
		import android.view.View;
		import android.widget.ImageView;

		import com.android.app.animation.Interpolators;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Dumpable;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.media.controls.models.player.MediaData;
		import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData;
		@@ -65,18 +51,11 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.Di
		import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;
		import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;
		import com.android.systemui.statusbar.phone.BiometricUnlockController;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.LockscreenWallpaper;
		import com.android.systemui.statusbar.phone.ScrimController;
		import com.android.systemui.statusbar.phone.ScrimState;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.util.Utils;
		import com.android.systemui.util.concurrency.DelayableExecutor;

		import dagger.Lazy;

		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		@@ -85,7 +64,6 @@ import java.util.HashSet;
		import java.util.List;
		import java.util.Objects;
		import java.util.Optional;
		import java.util.Set;
		import java.util.stream.Collectors;

		/**
		@@ -99,7 +77,6 @@ public class NotificationMediaManager implements Dumpable {
		private final StatusBarStateController mStatusBarStateController;
		private final SysuiColorExtractor mColorExtractor;
		private final KeyguardStateController mKeyguardStateController;
		private final KeyguardBypassController mKeyguardBypassController;
		private static final HashSet<Integer> PAUSED_MEDIA_STATES = new HashSet<>();
		private static final HashSet<Integer> CONNECTING_MEDIA_STATES = new HashSet<>();
		static {
		@@ -116,9 +93,6 @@ public class NotificationMediaManager implements Dumpable {
		private final NotifPipeline mNotifPipeline;
		private final NotifCollection mNotifCollection;

		@Nullable
		private Lazy<NotificationShadeWindowController> mNotificationShadeWindowController;

		@Nullable
		private BiometricUnlockController mBiometricUnlockController;
		@Nullable
		@@ -128,12 +102,8 @@ public class NotificationMediaManager implements Dumpable {
		@VisibleForTesting
		boolean mIsLockscreenLiveWallpaperEnabled;

		private final DelayableExecutor mMainExecutor;

		private final Context mContext;
		private final ArrayList<MediaListener> mMediaListeners;
		private final MediaArtworkProcessor mMediaArtworkProcessor;
		private final Set<AsyncTask<?, ?, ?>> mProcessArtworkTasks = new ArraySet<>();

		protected NotificationPresenter mPresenter;
		private MediaController mMediaController;
		@@ -150,8 +120,6 @@ public class NotificationMediaManager implements Dumpable {
		private List<String> mSmallerInternalDisplayUids;
		private Display mCurrentDisplay;

		private LockscreenWallpaper.WallpaperDrawable mWallapperDrawable;

		private final MediaController.Callback mMediaListener = new MediaController.Callback() {
		@Override
		public void onPlaybackStateChanged(PlaybackState state) {
		@@ -173,7 +141,6 @@ public class NotificationMediaManager implements Dumpable {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: onMetadataChanged: " + metadata);
		}
		mMediaArtworkProcessor.clearCache();
		mMediaMetadata = metadata;
		dispatchUpdateMediaMetaData(true /* changed /, true / allowAnimation */);
		}
		@@ -184,13 +151,9 @@ public class NotificationMediaManager implements Dumpable {
		*/
		public NotificationMediaManager(
		Context context,
		Lazy<NotificationShadeWindowController> notificationShadeWindowController,
		NotificationVisibilityProvider visibilityProvider,
		MediaArtworkProcessor mediaArtworkProcessor,
		KeyguardBypassController keyguardBypassController,
		NotifPipeline notifPipeline,
		NotifCollection notifCollection,
		@Main DelayableExecutor mainExecutor,
		MediaDataManager mediaDataManager,
		StatusBarStateController statusBarStateController,
		SysuiColorExtractor colorExtractor,
		@@ -199,12 +162,8 @@ public class NotificationMediaManager implements Dumpable {
		WallpaperManager wallpaperManager,
		DisplayManager displayManager) {
		mContext = context;
		mMediaArtworkProcessor = mediaArtworkProcessor;
		mKeyguardBypassController = keyguardBypassController;
		mMediaListeners = new ArrayList<>();
		mNotificationShadeWindowController = notificationShadeWindowController;
		mVisibilityProvider = visibilityProvider;
		mMainExecutor = mainExecutor;
		mMediaDataManager = mediaDataManager;
		mNotifPipeline = notifPipeline;
		mNotifCollection = notifCollection;
		@@ -476,7 +435,6 @@ public class NotificationMediaManager implements Dumpable {
		}

		private void clearCurrentMediaNotificationSession() {
		mMediaArtworkProcessor.clearCache();
		mMediaMetadata = null;
		if (mMediaController != null) {
		if (DEBUG_MEDIA) {
		@@ -494,9 +452,6 @@ public class NotificationMediaManager implements Dumpable {
		public void onDisplayUpdated(Display display) {
		Trace.beginSection("NotificationMediaManager#onDisplayUpdated");
		mCurrentDisplay = display;
		if (mWallapperDrawable != null) {
		mWallapperDrawable.onDisplayUpdated(isOnSmallerInternalDisplays());
		}
		Trace.endSection();
		}

		@@ -531,18 +486,13 @@ public class NotificationMediaManager implements Dumpable {
		}

		/**
		* Refresh or remove lockscreen artwork from media metadata or the lockscreen wallpaper.
		* Update media state of lockscreen media views and controllers .
		*/
		public void updateMediaMetaData(boolean metaDataChanged, boolean allowEnterAnimation) {
		public void updateMediaMetaData(boolean metaDataChanged) {

		if (mIsLockscreenLiveWallpaperEnabled) return;

		Trace.beginSection("CentralSurfaces#updateMediaMetaData");
		if (!SHOW_LOCKSCREEN_MEDIA_ARTWORK) {
		Trace.endSection();
		return;
		}

		if (getBackDropView() == null) {
		Trace.endSection();
		return; // called too early
		@@ -566,168 +516,12 @@ public class NotificationMediaManager implements Dumpable {
		+ " state=" + mStatusBarStateController.getState());
		}

		Bitmap artworkBitmap = null;
		if (mediaMetadata != null && !mKeyguardBypassController.getBypassEnabled()) {
		artworkBitmap = mediaMetadata.getBitmap(MediaMetadata.METADATA_KEY_ART);
		if (artworkBitmap == null) {
		artworkBitmap = mediaMetadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART);
		}
		}

		// Process artwork on a background thread and send the resulting bitmap to
		// finishUpdateMediaMetaData.
		if (metaDataChanged) {
		for (AsyncTask<?, ?, ?> task : mProcessArtworkTasks) {
		task.cancel(true);
		}
		mProcessArtworkTasks.clear();
		}
		if (artworkBitmap != null && !Utils.useQsMediaPlayer(mContext)) {
		mProcessArtworkTasks.add(new ProcessArtworkTask(this, metaDataChanged,
		allowEnterAnimation).execute(artworkBitmap));
		} else {
		finishUpdateMediaMetaData(metaDataChanged, allowEnterAnimation, null);
		}

		Trace.endSection();
		}

		private void finishUpdateMediaMetaData(boolean metaDataChanged, boolean allowEnterAnimation,
		@Nullable Bitmap bmp) {
		Drawable artworkDrawable = null;
		if (bmp != null) {
		artworkDrawable = new BitmapDrawable(mBackdropBack.getResources(), bmp);
		}
		boolean hasMediaArtwork = artworkDrawable != null;
		boolean allowWhenShade = false;
		if (ENABLE_LOCKSCREEN_WALLPAPER && artworkDrawable == null) {
		Bitmap lockWallpaper =
		mLockscreenWallpaper != null ? mLockscreenWallpaper.getBitmap() : null;
		if (lockWallpaper != null) {
		artworkDrawable = new LockscreenWallpaper.WallpaperDrawable(
		mBackdropBack.getResources(), lockWallpaper, isOnSmallerInternalDisplays());
		// We're in the SHADE mode on the SIM screen - yet we still need to show
		// the lockscreen wallpaper in that mode.
		allowWhenShade = mStatusBarStateController.getState() == KEYGUARD;
		}
		}

		NotificationShadeWindowController windowController =
		mNotificationShadeWindowController.get();
		boolean hideBecauseOccluded = mKeyguardStateController.isOccluded();

		final boolean hasArtwork = artworkDrawable != null;
		mColorExtractor.setHasMediaArtwork(hasMediaArtwork);
		mColorExtractor.setHasMediaArtwork(false);
		if (mScrimController != null) {
		mScrimController.setHasBackdrop(hasArtwork);
		}

		if ((hasArtwork \|\| DEBUG_MEDIA_FAKE_ARTWORK)
		&& (mStatusBarStateController.getState() != StatusBarState.SHADE \|\| allowWhenShade)
		&& mBiometricUnlockController != null && mBiometricUnlockController.getMode()
		!= BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING
		&& !hideBecauseOccluded) {
		// time to show some art!
		if (mBackdrop.getVisibility() != View.VISIBLE) {
		mBackdrop.setVisibility(View.VISIBLE);
		if (allowEnterAnimation) {
		mBackdrop.setAlpha(0);
		mBackdrop.animate().alpha(1f);
		} else {
		mBackdrop.animate().cancel();
		mBackdrop.setAlpha(1f);
		}
		if (windowController != null) {
		windowController.setBackdropShowing(true);
		}
		metaDataChanged = true;
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Fading in album artwork");
		}
		}
		if (metaDataChanged) {
		if (mBackdropBack.getDrawable() != null) {
		Drawable drawable =
		mBackdropBack.getDrawable().getConstantState()
		.newDrawable(mBackdropFront.getResources()).mutate();
		mBackdropFront.setImageDrawable(drawable);
		mBackdropFront.setAlpha(1f);
		mBackdropFront.setVisibility(View.VISIBLE);
		} else {
		mBackdropFront.setVisibility(View.INVISIBLE);
		}

		if (DEBUG_MEDIA_FAKE_ARTWORK) {
		final int c = 0xFF000000 \| (int)(Math.random() * 0xFFFFFF);
		Log.v(TAG, String.format("DEBUG_MEDIA: setting new color: 0x%08x", c));
		mBackdropBack.setBackgroundColor(0xFFFFFFFF);
		mBackdropBack.setImageDrawable(new ColorDrawable(c));
		} else {
		if (artworkDrawable instanceof LockscreenWallpaper.WallpaperDrawable) {
		mWallapperDrawable =
		(LockscreenWallpaper.WallpaperDrawable) artworkDrawable;
		}
		mBackdropBack.setImageDrawable(artworkDrawable);
		mScrimController.setHasBackdrop(false);
		}

		if (mBackdropFront.getVisibility() == View.VISIBLE) {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Crossfading album artwork from "
		+ mBackdropFront.getDrawable()
		+ " to "
		+ mBackdropBack.getDrawable());
		}
		mBackdropFront.animate()
		.setDuration(250)
		.alpha(0f).withEndAction(mHideBackdropFront);
		}
		}
		} else {
		// need to hide the album art, either because we are unlocked, on AOD
		// or because the metadata isn't there to support it
		if (mBackdrop.getVisibility() != View.GONE) {
		if (DEBUG_MEDIA) {
		Log.v(TAG, "DEBUG_MEDIA: Fading out album artwork");
		}
		boolean cannotAnimateDoze = mStatusBarStateController.isDozing()
		&& !ScrimState.AOD.getAnimateChange();
		if (((mBiometricUnlockController != null && mBiometricUnlockController.getMode()
		== BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING
		\|\| cannotAnimateDoze))
		\|\| hideBecauseOccluded) {
		// We are unlocking directly - no animation!
		mBackdrop.setVisibility(View.GONE);
		mBackdropBack.setImageDrawable(null);
		if (windowController != null) {
		windowController.setBackdropShowing(false);
		}
		} else {
		if (windowController != null) {
		windowController.setBackdropShowing(false);
		}
		mBackdrop.animate()
		.alpha(0)
		.setInterpolator(Interpolators.ACCELERATE_DECELERATE)
		.setDuration(300)
		.setStartDelay(0)
		.withEndAction(() -> {
		mBackdrop.setVisibility(View.GONE);
		mBackdropFront.animate().cancel();
		mBackdropBack.setImageDrawable(null);
		mMainExecutor.execute(mHideBackdropFront);
		});
		if (mKeyguardStateController.isKeyguardFadingAway()) {
		mBackdrop.animate()
		.setDuration(
		mKeyguardStateController.getShortenedFadingAwayDuration())
		.setStartDelay(
		mKeyguardStateController.getKeyguardFadingAwayDelay())
		.setInterpolator(Interpolators.LINEAR)
		.start();
		}
		}
		}
		}
		Trace.endSection();
		}

		public void setup(BackDropView backdrop, ImageView backdropFront, ImageView backdropBack,
		@@ -758,15 +552,6 @@ public class NotificationMediaManager implements Dumpable {
		}
		};

		private Bitmap processArtwork(Bitmap artwork) {
		return mMediaArtworkProcessor.processArtwork(mContext, artwork);
		}

		@MainThread
		private void removeTask(AsyncTask<?, ?, ?> task) {
		mProcessArtworkTasks.remove(task);
		}

		// TODO(b/273443374): remove
		public boolean isLockscreenWallpaperOnNotificationShade() {
		return mBackdrop != null && mLockscreenWallpaper != null
		@@ -780,52 +565,6 @@ public class NotificationMediaManager implements Dumpable {
		return mBackdrop;
		}

		/**
		* {@link AsyncTask} to prepare album art for use as backdrop on lock screen.
		*/
		private static final class ProcessArtworkTask extends AsyncTask<Bitmap, Void, Bitmap> {

		private final WeakReference<NotificationMediaManager> mManagerRef;
		private final boolean mMetaDataChanged;
		private final boolean mAllowEnterAnimation;

		ProcessArtworkTask(NotificationMediaManager manager, boolean changed,
		boolean allowAnimation) {
		mManagerRef = new WeakReference<>(manager);
		mMetaDataChanged = changed;
		mAllowEnterAnimation = allowAnimation;
		}

		@Override
		protected Bitmap doInBackground(Bitmap... bitmaps) {
		NotificationMediaManager manager = mManagerRef.get();
		if (manager == null \|\| bitmaps.length == 0 \|\| isCancelled()) {
		return null;
		}
		return manager.processArtwork(bitmaps[0]);
		}

		@Override
		protected void onPostExecute(@Nullable Bitmap result) {
		NotificationMediaManager manager = mManagerRef.get();
		if (manager != null && !isCancelled()) {
		manager.removeTask(this);
		manager.finishUpdateMediaMetaData(mMetaDataChanged, mAllowEnterAnimation, result);
		}
		}

		@Override
		protected void onCancelled(Bitmap result) {
		if (result != null) {
		result.recycle();
		}
		NotificationMediaManager manager = mManagerRef.get();
		if (manager != null) {
		manager.removeTask(this);
		}
		}
		}

		public interface MediaListener {
		/**
		* Called whenever there's new metadata or playback state.

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import com.android.systemui.animation.DialogLaunchAnimator;
		import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpHandler;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		@@ -45,12 +44,10 @@ import com.android.systemui.shade.ShadeSurface;
		import com.android.systemui.shade.carrier.ShadeCarrierGroupController;
		import com.android.systemui.statusbar.ActionClickLogger;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.MediaArtworkProcessor;
		import com.android.systemui.statusbar.NotificationClickNotifier;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationMediaManager;
		import com.android.systemui.statusbar.NotificationRemoteInputManager;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.SmartReplyController;
		import com.android.systemui.statusbar.StatusBarStateControllerImpl;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		@@ -61,7 +58,6 @@ import com.android.systemui.statusbar.notification.collection.NotifCollection;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;
		import com.android.systemui.statusbar.phone.CentralSurfacesImpl;
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.ManagedProfileController;
		import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		@@ -71,7 +67,6 @@ import com.android.systemui.statusbar.phone.StatusBarNotificationPresenterModule
		import com.android.systemui.statusbar.phone.StatusBarRemoteInputCallback;
		import com.android.systemui.statusbar.policy.KeyguardStateController;
		import com.android.systemui.statusbar.policy.RemoteInputUriController;
		import com.android.systemui.util.concurrency.DelayableExecutor;

		import dagger.Binds;
		import dagger.Lazy;
		@@ -122,13 +117,9 @@ public interface CentralSurfacesDependenciesModule {
		@Provides
		static NotificationMediaManager provideNotificationMediaManager(
		Context context,
		Lazy<NotificationShadeWindowController> notificationShadeWindowController,
		NotificationVisibilityProvider visibilityProvider,
		MediaArtworkProcessor mediaArtworkProcessor,
		KeyguardBypassController keyguardBypassController,
		NotifPipeline notifPipeline,
		NotifCollection notifCollection,
		@Main DelayableExecutor mainExecutor,
		MediaDataManager mediaDataManager,
		StatusBarStateController statusBarStateController,
		SysuiColorExtractor colorExtractor,
		@@ -138,13 +129,9 @@ public interface CentralSurfacesDependenciesModule {
		DisplayManager displayManager) {
		return new NotificationMediaManager(
		context,
		notificationShadeWindowController,
		visibilityProvider,
		mediaArtworkProcessor,
		keyguardBypassController,
		notifPipeline,
		notifCollection,
		mainExecutor,
		mediaDataManager,
		statusBarStateController,
		colorExtractor,

packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java

deleted100644 → 0

+0 −131

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java

+1 −2

File changed.

Preview size limit exceeded, changes collapsed.