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

Commit d17ce06d authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Remove SignalCallback#setCallIndicator & associated methods. 

SignalController#notifyCallStateChange was the only class invoking
SignalCallback#setCallIndicator, but #notifyCallStateChange is never
actually called. So, this CL removes #notifyCallStateChange,
setCallIndicator, and any other associated methods and classes.

Bug: 291321279
Flag: EXEMPT dead code removal
Test: compiles
Test: atest StatusBarSignalPolicyTest StatusBarIconControllerImplTest
Change-Id: I8eb41612d32ff55b17cba1931f0f754ba9a22ad2
parent aa6a47fd

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt

+1 −4
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import com.android.systemui.statusbar.phone.ui.StatusBarIconController 
import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.airplaneModeInteractor

import com.android.systemui.statusbar.policy.SecurityController

import com.android.systemui.tuner.TunerService

import com.android.systemui.util.CarrierConfigTracker

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.mockito.mock

import kotlin.test.Test

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent
@@ -46,7 +46,6 @@ import org.junit.runner.RunWith 
import org.mockito.Mockito.verify

import org.mockito.kotlin.clearInvocations

import org.mockito.kotlin.verifyNoMoreInteractions

import kotlin.test.Test



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -65,7 +64,6 @@ class StatusBarSignalPolicyTest : SysuiTestCase() { 
    private val tunerService = mock<TunerService>()

    private val statusBarIconController = mock<StatusBarIconController>()

    private val networkController = mock<NetworkController>()

    private val carrierConfigTracker = mock<CarrierConfigTracker>()



    private var slotAirplane: String? = null
@@ -75,7 +73,6 @@ class StatusBarSignalPolicyTest : SysuiTestCase() { 
            StatusBarSignalPolicy_Factory.newInstance(

                mContext,

                statusBarIconController,

                carrierConfigTracker,

                networkController,

                securityController,

                tunerService,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java

+0 −8
Original line number Diff line number Diff line
@@ -676,14 +676,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
        }

    }



    protected void verifyLastCallStrength(int icon) {

        ArgumentCaptor<IconState> iconArg = ArgumentCaptor.forClass(IconState.class);

        verify(mCallbackHandler, Mockito.atLeastOnce()).setCallIndicator(

                iconArg.capture(),

                anyInt());

        assertEquals("Call strength, in status bar", icon, (int) iconArg.getValue().icon);

    }



    protected void assertNetworkNameEquals(String expected) {

        assertEquals("Network name", expected, mMobileSignalController.getState().networkName);

    }

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/CallbackHandler.java

+0 −22
Original line number Diff line number Diff line
@@ -170,28 +170,6 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa 
        });

    }



    @Override

    public void setCallIndicator(IconState statusIcon, int subId) {

        String currentCallback = new StringBuilder()

                .append("setCallIndicator: ")

                .append("statusIcon=").append(statusIcon).append(",")

                .append("subId=").append(subId)

                .toString();

        if (!currentCallback.equals(mLastCallback)) {

            mLastCallback = currentCallback;

            String log = new StringBuilder()

                    .append(SSDF.format(System.currentTimeMillis())).append(",")

                    .append(currentCallback).append(",")

                    .toString();

            recordLastCallback(log);

        }

        post(() -> {

            for (SignalCallback signalCluster : mSignalCallbacks) {

                signalCluster.setCallIndicator(statusIcon, subId);

            }

        });

    }



    @Override

    public void setSubs(List<SubscriptionInfo> subs) {

        String currentCallback = new StringBuilder()

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalCallback.kt

+0 −7
Original line number Diff line number Diff line
@@ -95,13 +95,6 @@ interface SignalCallback { 
        noValidatedNetwork: Boolean,

        noNetworksAvailable: Boolean,

    ) {}



    /**

     * Callback for listeners to be able to update the call indicator

     * @param statusIcon the icon for the call indicator

     * @param subId subscription ID for which to update the UI

     */

    fun setCallIndicator(statusIcon: IconState, subId: Int) {}

}



/** Box type for [SignalCallback.setWifiIndicators] */

packages/SystemUI/src/com/android/systemui/statusbar/connectivity/SignalController.java

+0 −4
Original line number Diff line number Diff line
@@ -167,10 +167,6 @@ public abstract class SignalController<T extends ConnectivityState, I extends Ic 
        }

    }



    protected final void notifyCallStateChange(IconState statusIcon, int subId) {

        mCallbackHandler.setCallIndicator(statusIcon, subId);

    }



    /**

     * Returns the resource if resId is not 0, and an empty string otherwise.

     */