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

Commit 7ad49489 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Update due to changing name of carrier config items... 

Merge "Update due to changing name of carrier config items KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT" into main
parents 1d3eb1ee 3c8b5113

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+6 −6
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ import static android.telephony.CarrierConfigManager.KEY_EMERGENCY_MESSAGING_SUP 
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_NIDD_APN_NAME_STRING;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_TURN_OFF_SESSION_FOR_EMERGENCY_CALL_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.SubscriptionManager.SATELLITE_ATTACH_ENABLED_FOR_CARRIER;

import static android.telephony.SubscriptionManager.SATELLITE_ENTITLEMENT_STATUS;

import static android.telephony.SubscriptionManager.isValidSubscriptionId;
@@ -4342,9 +4342,9 @@ public class SatelliteController extends Handler { 
                    KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,

                    KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT,

                    KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT,

                    KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                    KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                    KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT

                    KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                    KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                    KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT

            );

        }

        if (config == null || config.isEmpty()) {

src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java

+6 −6
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.internal.telephony.satellite;



import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE;
@@ -1380,21 +1380,21 @@ public class SatelliteSessionController extends StateMachine { 
    private int getScreenOffInactivityTimeoutDurationSec() {

        PersistableBundle config = mSatelliteController.getPersistableBundle(getSubId());



        return config.getInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

        return config.getInt(KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                DEFAULT_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC);

    }



    private int getP2pSmsInactivityTimeoutDurationSec() {

        PersistableBundle config = mSatelliteController.getPersistableBundle(getSubId());



        return config.getInt(KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

        return config.getInt(KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                DEFAULT_P2P_SMS_INACTIVITY_TIMEOUT_SEC);

    }



    private int getEsosInactivityTimeoutDurationSec() {

        PersistableBundle config = mSatelliteController.getPersistableBundle(getSubId());



        return config.getInt(KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

        return config.getInt(KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

                DEFAULT_ESOS_INACTIVITY_TIMEOUT_SEC);

    }

tests/telephonytests/src/com/android/internal/telephony/satellite/SatelliteSessionControllerTest.java

+7 −7
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.internal.telephony.satellite;



import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED;

import static android.telephony.satellite.SatelliteManager.SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS;
@@ -201,7 +201,7 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
                eq(mTestSatelliteSessionController.getHandler()), anyInt(), any());

        when(mMockSatelliteController.getRequestIsEmergency()).thenReturn(false);

        PersistableBundle bundle = new PersistableBundle();

        bundle.putInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

        bundle.putInt(KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                SCREEN_OFF_INACTIVITY_TIMEOUT_SEC);

        when(mMockSatelliteController.getPersistableBundle(anyInt())).thenReturn(bundle);
@@ -239,7 +239,7 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        // Satellite enabling request is for an emergency.

        when(mMockSatelliteController.getRequestIsEmergency()).thenReturn(true);

        PersistableBundle bundle = new PersistableBundle();

        bundle.putInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

        bundle.putInt(KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT,

                SCREEN_OFF_INACTIVITY_TIMEOUT_SEC);

        when(mMockSatelliteController.getPersistableBundle(anyInt())).thenReturn(bundle);
@@ -291,7 +291,7 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
                anyInt())).thenReturn(true);

        when(mMockSatelliteController.isInCarrierRoamingNbIotNtn()).thenReturn(true);

        PersistableBundle bundle = new PersistableBundle();

        bundle.putInt(KEY_SATELLITE_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

        bundle.putInt(KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT,

                P2P_SMS_INACTIVITY_TIMEOUT_SEC);

        when(mMockSatelliteController.getPersistableBundle(anyInt())).thenReturn(bundle);
@@ -334,7 +334,7 @@ public class SatelliteSessionControllerTest extends TelephonyTest { 
        when(mMockSatelliteController.getRequestIsEmergency()).thenReturn(true);

        when(mMockSatelliteController.isSatelliteEsosSupported(anyInt())).thenReturn(true);

        PersistableBundle bundle = new PersistableBundle();

        bundle.putInt(KEY_SATELLITE_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

        bundle.putInt(KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT,

                ESOS_INACTIVITY_TIMEOUT_SEC);

        when(mMockSatelliteController.getPersistableBundle(anyInt())).thenReturn(bundle);