Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115b8514 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15671342, 15671402, 15670951, 15671362, 15671363,... 

Merge cherrypicks of [15671342, 15671402, 15670951, 15671362, 15671363, 15671364, 15671365, 15671366, 15671343, 15671344, 15671345, 15671346, 15671347, 15671367, 15671368, 15671369, 15671370] into sc-d1-release

Change-Id: I2832b48a48fbe423e57202e03f28ce5250eb1e30
parents 4272d2de 85faec75

media/java/android/media/PlayerBase.java

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ public abstract class PlayerBase { 
        mState = AudioPlaybackConfiguration.PLAYER_STATE_IDLE;

    };



    /** @hide */

    public int getPlayerIId() {

        synchronized (mLock) {

            return mPlayerIId;

        }

    }



    /**

     * Call from derived class when instantiation / initialization is successful

     */

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+1 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ public class UdfpsController implements DozeReceiver { 
                        mKeyguardViewMediator,

                        mLockscreenShadeTransitionController,

                        mConfigurationController,

                        mKeyguardStateController,

                        this

                );

            case IUdfpsOverlayController.REASON_AUTH_BP:

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java

+42 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.statusbar.phone.KeyguardBouncer; 
import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.DelayableExecutor;



import java.io.FileDescriptor;
@@ -50,6 +51,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
    @NonNull private final KeyguardViewMediator mKeyguardViewMediator;

    @NonNull private final LockscreenShadeTransitionController mLockScreenShadeTransitionController;

    @NonNull private final ConfigurationController mConfigurationController;

    @NonNull private final KeyguardStateController mKeyguardStateController;

    @NonNull private final UdfpsController mUdfpsController;



    private boolean mShowingUdfpsBouncer;
@@ -60,6 +62,9 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
    private float mTransitionToFullShadeProgress;

    private float mLastDozeAmount;



    private float mStatusBarExpansion;

    private boolean mLaunchTransitionFadingAway;



    /**

     * hidden amount of pin/pattern/password bouncer

     * {@link KeyguardBouncer#EXPANSION_VISIBLE} (0f) to
@@ -79,6 +84,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
            @NonNull KeyguardViewMediator keyguardViewMediator,

            @NonNull LockscreenShadeTransitionController transitionController,

            @NonNull ConfigurationController configurationController,

            @NonNull KeyguardStateController keyguardStateController,

            @NonNull UdfpsController udfpsController) {

        super(view, statusBarStateController, statusBar, dumpManager);

        mKeyguardViewManager = statusBarKeyguardViewManager;
@@ -87,6 +93,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        mKeyguardViewMediator = keyguardViewMediator;

        mLockScreenShadeTransitionController = transitionController;

        mConfigurationController = configurationController;

        mKeyguardStateController = keyguardStateController;

        mUdfpsController = udfpsController;

    }
@@ -105,11 +112,14 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 


        mUdfpsRequested = false;



        mLaunchTransitionFadingAway = mKeyguardStateController.isLaunchTransitionFadingAway();

        mKeyguardStateController.addCallback(mKeyguardStateControllerCallback);

        mStatusBarState = mStatusBarStateController.getState();

        mQsExpanded = mKeyguardViewManager.isQsExpanded();

        mInputBouncerHiddenAmount = KeyguardBouncer.EXPANSION_HIDDEN;

        mIsBouncerVisible = mKeyguardViewManager.bouncerIsOrWillBeShowing();

        mConfigurationController.addCallback(mConfigurationListener);

        mStatusBar.addExpansionChangedListener(mStatusBarExpansionChangedListener);

        updateAlpha();

        updatePauseAuth();
@@ -122,10 +132,12 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        super.onViewDetached();

        mFaceDetectRunning = false;



        mKeyguardStateController.removeCallback(mKeyguardStateControllerCallback);

        mStatusBarStateController.removeCallback(mStateListener);

        mKeyguardViewManager.removeAlternateAuthInterceptor(mAlternateAuthInterceptor);

        mKeyguardUpdateMonitor.requestFaceAuthOnOccludingApp(false);

        mConfigurationController.removeCallback(mConfigurationListener);

        mStatusBar.removeExpansionChangedListener(mStatusBarExpansionChangedListener);

        if (mLockScreenShadeTransitionController.getUdfpsKeyguardViewController() == this) {

            mLockScreenShadeTransitionController.setUdfpsKeyguardViewController(null);

        }
@@ -140,9 +152,11 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
        pw.println("mQsExpanded=" + mQsExpanded);

        pw.println("mIsBouncerVisible=" + mIsBouncerVisible);

        pw.println("mInputBouncerHiddenAmount=" + mInputBouncerHiddenAmount);

        pw.println("mStatusBarExpansion=" + mStatusBarExpansion);

        pw.println("mAlpha=" + mView.getAlpha());

        pw.println("mUdfpsRequested=" + mUdfpsRequested);

        pw.println("mView.mUdfpsRequested=" + mView.mUdfpsRequested);

        pw.println("mLaunchTransitionFadingAway=" + mLaunchTransitionFadingAway);

    }



    /**
@@ -189,6 +203,10 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
            return false;

        }



        if (mLaunchTransitionFadingAway) {

            return true;

        }



        if (mStatusBarState != KEYGUARD) {

            return true;

        }
@@ -237,10 +255,13 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
    }



    private void updateAlpha() {

        // fade icon on transition to showing bouncer

        // fade icon on transitions to showing the status bar, but if mUdfpsRequested, then

        // the keyguard is occluded by some application - so instead use the input bouncer

        // hidden amount to determine the fade

        float expansion = mUdfpsRequested ? mInputBouncerHiddenAmount : mStatusBarExpansion;

        int alpha = mShowingUdfpsBouncer ? 255

                : (int) MathUtils.constrain(

                    MathUtils.map(.5f, .9f, 0f, 255f, mInputBouncerHiddenAmount),

                    MathUtils.map(.5f, .9f, 0f, 255f, expansion),

                    0f, 255f);

        alpha *= (1.0f - mTransitionToFullShadeProgress);

        mView.setUnpausedAlpha(alpha);
@@ -356,4 +377,23 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud 
                    mView.updateColor();

                }

            };



    private final StatusBar.ExpansionChangedListener mStatusBarExpansionChangedListener =

            new StatusBar.ExpansionChangedListener() {

                @Override

                public void onExpansionChanged(float expansion, boolean expanded) {

                    mStatusBarExpansion = expansion;

                    updateAlpha();

                }

            };



    private final KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {

                @Override

                public void onLaunchTransitionFadingAwayChanged() {

                    mLaunchTransitionFadingAway =

                            mKeyguardStateController.isLaunchTransitionFadingAway();

                    updatePauseAuth();

                }

            };

}

packages/SystemUI/src/com/android/systemui/media/NotificationPlayer.java

+17 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
                                + " with ducking", e);

                    }

                    player.start();

                    if (DEBUG) { Log.d(mTag, "player.start"); }

                    if (DEBUG) { Log.d(mTag, "player.start piid:" + player.getPlayerIId()); }

                } catch (Exception e) {

                    if (player != null) {

                        player.release();
@@ -155,7 +155,13 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
                    mPlayer = player;

                }

                if (mp != null) {

                    if (DEBUG) { Log.d(mTag, "mPlayer.release"); }

                    if (DEBUG) {

                        Log.d(mTag, "mPlayer.pause+release piid:" + player.getPlayerIId());

                    }

                    mp.pause();

                    try {

                        Thread.sleep(100);

                    } catch (InterruptedException ie) { }

                    mp.release();

                }

                this.notify();
@@ -244,6 +250,10 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
                        try {

                            mp.stop();

                        } catch (Exception e) { }

                        if (DEBUG) {

                            Log.i(mTag, "About to release MediaPlayer piid:"

                                    + mp.getPlayerIId() + " due to notif cancelled");

                        }

                        mp.release();

                        synchronized(mQueueAudioFocusLock) {

                            if (mAudioManagerWithAudioFocus != null) {
@@ -284,7 +294,7 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
    public void onCompletion(MediaPlayer mp) {

        synchronized(mQueueAudioFocusLock) {

            if (mAudioManagerWithAudioFocus != null) {

                if (DEBUG) Log.d(mTag, "onCompletion() abandonning AudioFocus");

                if (DEBUG) Log.d(mTag, "onCompletion() abandoning AudioFocus");

                mAudioManagerWithAudioFocus.abandonAudioFocus(null);

                mAudioManagerWithAudioFocus = null;

            } else {
@@ -310,6 +320,10 @@ public class NotificationPlayer implements OnCompletionListener, OnErrorListener 
            }

        }

        if (mp != null) {

            if (DEBUG) {

                Log.i("NotificationPlayer", "About to release MediaPlayer piid:"

                        + mp.getPlayerIId() + " due to onCompletion");

            }

            mp.release();

        }

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        if (mKeyguardUpdateMonitor.needsSlowUnlockTransition() && mState == ScrimState.UNLOCKED) {

            mAnimationDelay = StatusBar.FADE_KEYGUARD_START_DELAY;

            scheduleUpdate();

        } else if ((oldState == ScrimState.AOD  // leaving doze

        } else if (((oldState == ScrimState.AOD || oldState == ScrimState.PULSING)  // leaving doze

                && (!mDozeParameters.getAlwaysOn() || mState == ScrimState.UNLOCKED))

                || (mState == ScrimState.AOD && !mDozeParameters.getDisplayNeedsBlanking())) {

            // Scheduling a frame isn't enough when:
@@ -711,7 +711,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
            }

            if (mUnOcclusionAnimationRunning && mState == ScrimState.KEYGUARD) {

                // We're unoccluding the keyguard and don't want to have a bright flash.

                mNotificationsAlpha = 0f;

                mNotificationsAlpha = KEYGUARD_SCRIM_ALPHA;

                mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();

            }

        }

        if (isNaN(mBehindAlpha) || isNaN(mInFrontAlpha) || isNaN(mNotificationsAlpha)) {