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

Commit 3e665607 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Mark SignalCallback & SignalControllers as deprecated. 

Now that we have Recommended Architecture equivalents of all the
SignalCallback methods, we can mark the callback and all the controllers
that invoke the callback as deprecated.

Bug: 291321279
Flag: EXEMPT annotation-only change
Test: EXEMPT
Change-Id: I7188b0d8cd95edba2437ec9f3c6a7f4ef7d5d496
parent 008aed0f

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

+3 −1
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import android.net.NetworkCapabilities; 


import com.android.settingslib.AccessibilityContentDescriptions;

import com.android.settingslib.SignalIcon.IconGroup;

import com.android.systemui.statusbar.pipeline.ethernet.domain.EthernetInteractor;



import java.util.BitSet;



/** */

/** @deprecated use {@link EthernetInteractor} instead. */

@Deprecated

public class EthernetSignalController extends

        SignalController<ConnectivityState, IconGroup> {

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

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.settingslib.mobile.MobileStatusTracker.SubscriptionDefaults; 
import com.android.settingslib.mobile.TelephonyIcons;

import com.android.settingslib.net.SignalStrengthUtil;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIconsInteractor;

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy;

import com.android.systemui.util.CarrierConfigTracker;
@@ -55,7 +56,10 @@ import java.util.Map; 


/**

 * Monitors the mobile signal changes and update the SysUI icons.

 *

 * @deprecated Use {@link MobileIconsInteractor} instead.

 */

@Deprecated

public class MobileSignalController extends SignalController<MobileState, MobileIconGroup> {

    private static final SimpleDateFormat SSDF = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");

    private static final int STATUS_HISTORY_SIZE = 64;

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

+6 −0
Original line number Diff line number Diff line
@@ -22,7 +22,13 @@ import android.telephony.SubscriptionInfo 
 * SignalCallback contains all of the connectivity updates from [NetworkController]. Implement this

 * interface to be able to draw iconography for Wi-Fi, mobile data, ethernet, call strength

 * indicators, etc.

 *

 * @deprecated

 */

@Deprecated(

    "Use Recommended Architecture classes instead: MobileIconsInteractor, WifiInteractor, " +

        "AirplaneModeInteractor, and EthernetInteractor"

)

interface SignalCallback {

    /**

     * Called when the Wi-Fi iconography has been updated. Implement this method to draw Wi-Fi icons

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

+4 −0
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ import java.util.List; 
 *

 * @param <T> State of the SysUI controller.

 * @param <I> Icon groups of the SysUI controller for a given State.

 *

 * @deprecated "Use Recommended Architecture classes instead: MobileIconsInteractor, WifiInteractor,

 * AirplaneModeInteractor, and EthernetInteractor

 */

@Deprecated

public abstract class SignalController<T extends ConnectivityState, I extends IconGroup> {

    // Save the previous SignalController.States of all SignalControllers for dumps.

    static final boolean RECORD_HISTORY = true;

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

+3 −1
Original line number Diff line number Diff line
@@ -36,11 +36,13 @@ import com.android.settingslib.mobile.TelephonyIcons; 
import com.android.settingslib.wifi.WifiStatusTracker;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor;



import java.io.PrintWriter;

import java.util.BitSet;



/** */

/** @deprecated use {@link WifiInteractor} instead. */

@Deprecated

public class WifiSignalController extends SignalController<WifiState, IconGroup> {

    private final boolean mHasMobileDataFeature;

    private final WifiStatusTracker mWifiTracker;