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

Commit 6f886c52 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

Change-Id: I4a2bd1700604c1c3aae757cf3f284354bd197aa8
parents 92cb00c2 fa404791
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@


package com.android.server.power;
package com.android.server.power;


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


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


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