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

Commit b62318c8 authored by Thomas Nguyen's avatar Thomas Nguyen
Browse files

Guard satellite APIs with feature flags 

Bug: 301713420
Test: SMS, MMS, call with live network
atest SatelliteControllerTest SatelliteSOSMessageRecommenderTest
atest SatelliteManagerTestOnMockService SatelliteManagerTest
atest android.telephony.ims.cts.ImsCallingTest

Change-Id: Ib5e941f8f15b8f82ddea35021be635f41b40adbb
parent b784d24f

core/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -44213,7 +44213,7 @@ package android.telephony { 
    field public static final int OUT_OF_NETWORK = 11; // 0xb

    field public static final int OUT_OF_SERVICE = 18; // 0x12

    field public static final int POWER_OFF = 17; // 0x11

    field public static final int SATELLITE_ENABLED = 82; // 0x52

    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int SATELLITE_ENABLED = 82; // 0x52

    field public static final int SERVER_ERROR = 12; // 0xc

    field public static final int SERVER_UNREACHABLE = 9; // 0x9

    field public static final int TIMED_OUT = 13; // 0xd
@@ -44322,7 +44322,7 @@ package android.telephony { 
    method public boolean isNetworkRegistered();

    method public boolean isNetworkRoaming();

    method public boolean isNetworkSearching();

    method public boolean isNonTerrestrialNetwork();

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public boolean isNonTerrestrialNetwork();

    method @Deprecated public boolean isRegistered();

    method @Deprecated public boolean isRoaming();

    method @Deprecated public boolean isSearching();
@@ -44338,7 +44338,7 @@ package android.telephony { 
    field public static final int NR_STATE_RESTRICTED = 1; // 0x1

    field public static final int SERVICE_TYPE_DATA = 2; // 0x2

    field public static final int SERVICE_TYPE_EMERGENCY = 5; // 0x5

    field public static final int SERVICE_TYPE_MMS = 6; // 0x6

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final int SERVICE_TYPE_MMS = 6; // 0x6

    field public static final int SERVICE_TYPE_SMS = 3; // 0x3

    field public static final int SERVICE_TYPE_UNKNOWN = 0; // 0x0

    field public static final int SERVICE_TYPE_VIDEO = 4; // 0x4
@@ -44553,7 +44553,7 @@ package android.telephony { 
    method public boolean getRoaming();

    method public int getState();

    method public boolean isSearching();

    method public boolean isUsingNonTerrestrialNetwork();

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public boolean isUsingNonTerrestrialNetwork();

    method public void setIsManualSelection(boolean);

    method public void setOperatorName(String, String, String);

    method public void setRoaming(boolean);
@@ -45339,7 +45339,7 @@ package android.telephony { 
    field public static final int ERI_FLASH = 2; // 0x2

    field public static final int ERI_OFF = 1; // 0x1

    field public static final int ERI_ON = 0; // 0x0

    field public static final String EVENT_DISPLAY_SOS_MESSAGE = "android.telephony.event.DISPLAY_SOS_MESSAGE";

    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String EVENT_DISPLAY_SOS_MESSAGE = "android.telephony.event.DISPLAY_SOS_MESSAGE";

    field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";

    field public static final String EXTRA_APN_PROTOCOL = "android.telephony.extra.APN_PROTOCOL";

    field public static final String EXTRA_APN_TYPE = "android.telephony.extra.APN_TYPE";

core/api/system-current.txt

+131 −131

File changed.

Preview size limit exceeded, changes collapsed.

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3190,7 +3190,7 @@ package android.telephony { 
    field public static final int HAL_SERVICE_MESSAGING = 2; // 0x2

    field public static final int HAL_SERVICE_MODEM = 3; // 0x3

    field public static final int HAL_SERVICE_NETWORK = 4; // 0x4

    field public static final int HAL_SERVICE_SATELLITE = 8; // 0x8

    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int HAL_SERVICE_SATELLITE = 8; // 0x8

    field public static final int HAL_SERVICE_SIM = 5; // 0x5

    field public static final int HAL_SERVICE_VOICE = 6; // 0x6

    field public static final android.util.Pair HAL_VERSION_UNKNOWN;

telephony/java/android/telephony/DisconnectCause.java

+4 −0
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 


package android.telephony;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;



import com.android.internal.telephony.flags.Flags;



/**

 * Describes the cause of a disconnected call. Those disconnect causes can be converted into a more

 * generic {@link android.telecom.DisconnectCause} object.
@@ -363,6 +366,7 @@ public final class DisconnectCause { 
    /**

     * Indicates that the call was unable to be made because the satellite modem is enabled.

     */

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    public static final int SATELLITE_ENABLED = 82;



    //*********************************************************************************************

telephony/java/android/telephony/NetworkRegistrationInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telephony;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -30,6 +31,8 @@ import android.telephony.AccessNetworkConstants.TransportType; 
import android.telephony.Annotation.NetworkType;

import android.text.TextUtils;



import com.android.internal.telephony.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -206,6 +209,7 @@ public final class NetworkRegistrationInfo implements Parcelable { 
    /**

     * MMS service

     */

    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    public static final int SERVICE_TYPE_MMS = 6;



    /** @hide  */
@@ -702,6 +706,7 @@ public final class NetworkRegistrationInfo implements Parcelable { 
     *

     * @return {@code true} if network is a non-terrestrial network else {@code false}.

     */

    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    public boolean isNonTerrestrialNetwork() {

        return mIsNonTerrestrialNetwork;

    }
@@ -1186,6 +1191,7 @@ public final class NetworkRegistrationInfo implements Parcelable { 
         *                                            else {@code false}.

         * @return The builder.

         */

        @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

        public @NonNull Builder setIsNonTerrestrialNetwork(boolean isNonTerrestrialNetwork) {

            mIsNonTerrestrialNetwork = isNonTerrestrialNetwork;

            return this;