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

Commit e9e96366 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Joonhun Shin
Browse files

Conver hidden APIs to system APIs for satellite 

Bug: 381009685
Test: 381458109
Flag: com.android.internal.telephony.flags.satellite_system_apis
Change-Id: I45fb0cfd36fce65b35526011ac7b4e2f50657234
parent c39974b3

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

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_S 
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ROAMING_TURN_OFF_SESSION_FOR_EMERGENCY_CALL_BOOL;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT;

import static android.telephony.CarrierConfigManager.KEY_SATELLITE_SUPPORTED_MSG_APPS_STRING_ARRAY;

import static android.telephony.SubscriptionManager.SATELLITE_ATTACH_ENABLED_FOR_CARRIER;

import static android.telephony.SubscriptionManager.SATELLITE_ENTITLEMENT_STATUS;
@@ -5425,7 +5425,7 @@ public class SatelliteController extends Handler { 
                        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,

                        KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE,

                        KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT,

                        KEY_SATELLITE_SUPPORTED_MSG_APPS_STRING_ARRAY,

                        KEY_REGIONAL_SATELLITE_EARFCN_BUNDLE,

                        KEY_SATELLITE_DATA_SUPPORT_MODE_INT
@@ -7998,8 +7998,8 @@ public class SatelliteController extends Handler { 
    private void overrideSatelliteCapabilitiesIfApplicable() {

        int subId = getSelectedSatelliteSubId();

        PersistableBundle config = getPersistableBundle(subId);

        if (config.containsKey(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE)) {

            int datagramSize = config.getInt(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE);

        if (config.containsKey(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT)) {

            int datagramSize = config.getInt(KEY_SATELLITE_SOS_MAX_DATAGRAM_SIZE_BYTES_INT);

            SubscriptionInfo subInfo = mSubscriptionManagerService.getSubscriptionInfo(subId);

            if (!(subInfo == null || subInfo.isOnlyNonTerrestrialNetwork())) {

                synchronized (mSatelliteCapabilitiesLock) {

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

+5 −3
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.internal.telephony.flags.FeatureFlags; 
import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.metrics.SatelliteStats;



import java.util.Arrays;

import java.util.List;

import java.util.concurrent.atomic.AtomicBoolean;
@@ -274,12 +275,13 @@ public class SatelliteSOSMessageRecommender extends Handler { 
    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PRIVATE)

    protected boolean isSatelliteAllowedByReasons() {

        SatelliteManager satelliteManager = mContext.getSystemService(SatelliteManager.class);

        List<Integer> disallowedReasons = satelliteManager.getSatelliteDisallowedReasons();

        if (disallowedReasons.stream().anyMatch(r ->

        int[] disallowedReasons = satelliteManager.getSatelliteDisallowedReasons();

        if (Arrays.stream(disallowedReasons).anyMatch(r ->

                (r == SATELLITE_DISALLOWED_REASON_UNSUPPORTED_DEFAULT_MSG_APP

                        || r == SATELLITE_DISALLOWED_REASON_NOT_PROVISIONED

                        || r == SATELLITE_DISALLOWED_REASON_NOT_SUPPORTED))) {

            plogd("isAllowedForDefaultMessageApp:false, disallowedReasons=" + disallowedReasons);

            plogd("isAllowedForDefaultMessageApp:false, disallowedReasons="

                    + Arrays.toString(disallowedReasons));

            return false;

        }

        return true;