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

Commit b47bc5c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Dependency#get from KeyguardSliceProvider"

parents 56fc3f5e 684dd4ef

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java

+4 −7
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import androidx.slice.builders.SliceAction; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.SystemUIAppComponentFactory;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -139,6 +138,8 @@ public class KeyguardSliceProvider extends SliceProvider implements 
    public StatusBarStateController mStatusBarStateController;

    @Inject

    public KeyguardBypassController mKeyguardBypassController;

    @Inject

    public KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private CharSequence mMediaTitle;

    private CharSequence mMediaArtist;

    protected boolean mDozing;
@@ -333,7 +334,7 @@ public class KeyguardSliceProvider extends SliceProvider implements 
            mAlarmManager.cancel(mUpdateNextAlarm);

            if (mRegistered) {

                mRegistered = false;

                getKeyguardUpdateMonitor().removeCallback(mKeyguardUpdateMonitorCallback);

                mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback);

                getContext().unregisterReceiver(mIntentReceiver);

            }

            KeyguardSliceProvider.sInstance = null;
@@ -389,7 +390,7 @@ public class KeyguardSliceProvider extends SliceProvider implements 
            filter.addAction(Intent.ACTION_LOCALE_CHANGED);

            getContext().registerReceiver(mIntentReceiver, filter, null /* permission*/,

                    null /* scheduler */);

            getKeyguardUpdateMonitor().registerCallback(mKeyguardUpdateMonitorCallback);

            mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback);

            mRegistered = true;

        }

    }
@@ -441,10 +442,6 @@ public class KeyguardSliceProvider extends SliceProvider implements 
        updateNextAlarm();

    }



    private KeyguardUpdateMonitor getKeyguardUpdateMonitor() {

        return Dependency.get(KeyguardUpdateMonitor.class);

    }



    /**

     * Called whenever new media metadata is available.

     * @param metadata New metadata.

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardSliceProviderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
    private DozeParameters mDozeParameters;

    @Mock

    private NextAlarmController mNextAlarmController;

    @Mock

    private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private TestableKeyguardSliceProvider mProvider;

    private boolean mIsZenMode;
@@ -97,7 +98,6 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mKeyguardUpdateMonitor = mDependency.injectMockDependency(KeyguardUpdateMonitor.class);

        mIsZenMode = false;

        mProvider = new TestableKeyguardSliceProvider();

        mProvider.setContextAvailableCallback(context -> { });
@@ -265,6 +265,7 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
            mStatusBarStateController = KeyguardSliceProviderTest.this.mStatusBarStateController;

            mKeyguardBypassController = KeyguardSliceProviderTest.this.mKeyguardBypassController;

            mMediaManager = KeyguardSliceProviderTest.this.mNotificationMediaManager;

            mKeyguardUpdateMonitor = KeyguardSliceProviderTest.this.mKeyguardUpdateMonitor;

        }



        @Override