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

Commit c1970b1d authored by Andrew Zeng's avatar Andrew Zeng Committed by android-build-merger
Browse files

Merge "Add null check for wireless charging animation." into pi-dev am: fa404791

am: 6f886c52

Change-Id: Id6fbb069f59aed4f37598d8a9451ce33dcacd6e4
parents 99ae19d1 6f886c52
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package com.android.server.power;

import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.ActivityManagerInternal;
import android.app.AppOpsManager;
@@ -97,7 +98,7 @@ final class Notifier {
    private final ActivityManagerInternal mActivityManagerInternal;
    private final InputManagerInternal mInputManagerInternal;
    private final InputMethodManagerInternal mInputMethodManagerInternal;
    private final StatusBarManagerInternal mStatusBarManagerInternal;
    @Nullable private final StatusBarManagerInternal mStatusBarManagerInternal;
    private final TrustManager mTrustManager;

    private final NotifierHandler mHandler;
@@ -738,7 +739,9 @@ final class Notifier {

    private void showWirelessChargingStarted(int batteryLevel) {
        playChargingStartedSound();
        if (mStatusBarManagerInternal != null) {
            mStatusBarManagerInternal.showChargingAnimation(batteryLevel);
        }
        mSuspendBlocker.release();
    }