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

Commit d017391f authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju
Browse files

Enhance TelephonyDisplayInfo API 

- Add non terrestrial network status support
- Add satellite banwidth constrained data status support

Flag: com.android.internal.telephony.flags.carrier_enabled_satellite_flag
Bug: 375921149
Test: m and atest
Test: Device test at b/375921149#comment6 (Telephony Display info updated to expected values)
Change-Id: I2f78feb8ed3c2461692f0191cfaa38322c49a0a7
parent 677cb7dc

packages/SettingsLib/src/com/android/settingslib/mobile/MobileStatusTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class MobileStatusTracker { 
        public SignalStrength signalStrength;

        public TelephonyDisplayInfo telephonyDisplayInfo =

                new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,

                        TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false);

                        TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false, false, false);



        /**

         * Empty constructor

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final TelephonyDisplayInfo DEFAULT_TELEPHONY_DISPLAY_INFO =

            new TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,

                    TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false);

                    TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false, false, false);



    static final int MAX_WIFI_ENTRY_COUNT = 3;

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ internal class MobileState( 
) : ConnectivityState() {



    @JvmField var telephonyDisplayInfo = TelephonyDisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,

            TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false)

            TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE, false, false, false)

    @JvmField var serviceState: ServiceState? = null

    @JvmField var signalStrength: SignalStrength? = null

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -655,14 +655,14 @@ class MobileConnectionRepositoryTest : SysuiTestCase() { 
            // CDMA roaming is off, GSM roaming is off

            whenever(telephonyManager.cdmaEnhancedRoamingIndicatorDisplayNumber).thenReturn(ERI_OFF)

            cb.onDisplayInfoChanged(

                TelephonyDisplayInfo(NETWORK_TYPE_LTE, NETWORK_TYPE_UNKNOWN, false)

                TelephonyDisplayInfo(NETWORK_TYPE_LTE, NETWORK_TYPE_UNKNOWN, false, false, false)

            )



            assertThat(latest).isFalse()



            // CDMA roaming is off, GSM roaming is on

            cb.onDisplayInfoChanged(

                TelephonyDisplayInfo(NETWORK_TYPE_LTE, NETWORK_TYPE_UNKNOWN, true)

                TelephonyDisplayInfo(NETWORK_TYPE_LTE, NETWORK_TYPE_UNKNOWN, true, false, false)

            )



            assertThat(latest).isTrue()

services/core/java/com/android/server/TelephonyRegistry.java

+5 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            overrideNetworkType = TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE;

        }

        boolean isRoaming = telephonyDisplayInfo.isRoaming();

        return new TelephonyDisplayInfo(networkType, overrideNetworkType, isRoaming);

        boolean isNtn = telephonyDisplayInfo.isNtn();

        boolean isSatelliteConstrainedData =

                telephonyDisplayInfo.isSatelliteConstrainedData();

        return new TelephonyDisplayInfo(networkType, overrideNetworkType, isRoaming,

                isNtn, isSatelliteConstrainedData);

    }



    public void notifyCallForwardingChanged(boolean cfi) {