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

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

Merge "Rename OnProjectionStateChangeListener -> OnProjectionStateChangedListener" into sc-dev

parents 755cbadf f75edc34

src/com/android/server/telecom/SystemStateHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
/**

 * Provides various system states to the rest of the telecom codebase.

 */

public class SystemStateHelper implements UiModeManager.OnProjectionStateChangeListener {

public class SystemStateHelper implements UiModeManager.OnProjectionStateChangedListener {

    public interface SystemStateListener {

        /**

         * Listener method to inform interested parties when a package name requests to enter or
@@ -154,7 +154,7 @@ public class SystemStateHelper implements UiModeManager.OnProjectionStateChangeL 
        Log.i(this, "Registering broadcast receiver: %s", intentFilter1);

        Log.i(this, "Registering broadcast receiver: %s", intentFilter2);



        mContext.getSystemService(UiModeManager.class).addOnProjectionStateChangeListener(

        mContext.getSystemService(UiModeManager.class).addOnProjectionStateChangedListener(

                UiModeManager.PROJECTION_TYPE_AUTOMOTIVE, mContext.getMainExecutor(), this);

        mIsCarModeOrProjectionActive = getSystemCarModeOrProjectionState();

    }

tests/src/com/android/server/telecom/tests/SystemStateHelperTest.java

+3 −3
Original line number Diff line number Diff line
@@ -249,9 +249,9 @@ public class SystemStateHelperTest extends TelecomTestCase { 
        SystemStateHelper systemStateHelper = new SystemStateHelper(mContext, mLock);

        // We don't care what listener is registered, that's an implementation detail, but we need

        // to call methods on whatever it is.

        ArgumentCaptor<UiModeManager.OnProjectionStateChangeListener> listenerCaptor =

                ArgumentCaptor.forClass(UiModeManager.OnProjectionStateChangeListener.class);

        verify(mUiModeManager).addOnProjectionStateChangeListener(

        ArgumentCaptor<UiModeManager.OnProjectionStateChangedListener> listenerCaptor =

                ArgumentCaptor.forClass(UiModeManager.OnProjectionStateChangedListener.class);

        verify(mUiModeManager).addOnProjectionStateChangedListener(

                eq(UiModeManager.PROJECTION_TYPE_AUTOMOTIVE), any(), listenerCaptor.capture());

        systemStateHelper.addListener(mSystemStateListener);