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

Commit 3be043c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED broadcast." into main

parents 35fb5283 af60af59

core/res/AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -843,6 +843,7 @@ 
    <protected-broadcast android:name="android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED" />

    <protected-broadcast android:name="android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED" />

    <protected-broadcast android:name="android.intent.action.MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED" />

    <protected-broadcast android:name="android.intent.action.MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED" />

    <protected-broadcast android:name="com.android.uwb.uwbcountrycode.GEOCODE_RETRY" />

    <protected-broadcast android:name="com.android.uwb.uwbcountrycode.GEOCODE_RETRY" />

    <protected-broadcast android:name="android.telephony.action.ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED" />





    <!-- ====================================================================== -->

    <!-- ====================================================================== -->

    <!--                          RUNTIME PERMISSIONS                           -->

    <!--                          RUNTIME PERMISSIONS                           -->

core/res/res/values/config_telephony.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -440,10 +440,6 @@ 
    <string name="config_satellite_carrier_roaming_esos_provisioned_class" translatable="false"></string>

    <string name="config_satellite_carrier_roaming_esos_provisioned_class" translatable="false"></string>

    <java-symbol type="string" name="config_satellite_carrier_roaming_esos_provisioned_class" />

    <java-symbol type="string" name="config_satellite_carrier_roaming_esos_provisioned_class" />





    <!-- Telephony satellite gateway intent for handling carrier roaming to satellite is using ESOS messaging. -->

    <string name="config_satellite_carrier_roaming_esos_provisioned_intent_action" translatable="false"></string>

    <java-symbol type="string" name="config_satellite_carrier_roaming_esos_provisioned_intent_action" />



    <!-- The time duration in minutes to wait before retry validating a possible change

    <!-- The time duration in minutes to wait before retry validating a possible change

         in satellite allowed region. The default value is 10 minutes. -->

         in satellite allowed region. The default value is 10 minutes. -->

    <integer name="config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region">10</integer>

    <integer name="config_satellite_delay_minutes_before_retry_validating_possible_change_in_allowed_region">10</integer>

telephony/java/android/telephony/satellite/SatelliteManager.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -545,6 +545,16 @@ public final class SatelliteManager { 
    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    public static final int EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911 = 2;

    public static final int EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911 = 2;





    /**

     * This intent will be broadcasted if there are any change to list of subscriber informations.

     * This intent will be sent only to the app with component defined in

     * config_satellite_carrier_roaming_esos_provisioned_class and package defined in

     * config_satellite_gateway_service_package

     * @hide

     */

    public static final String ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED =

            "android.telephony.action.ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED";



    /**

    /**

     * Request to enable or disable the satellite modem and demo mode.

     * Request to enable or disable the satellite modem and demo mode.

     * If satellite modem and cellular modem cannot work concurrently,

     * If satellite modem and cellular modem cannot work concurrently,