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

Commit a533f04c authored by Sungcheol Ahn's avatar Sungcheol Ahn Committed by Android (Google) Code Review
Browse files

Merge "[Satellite] Changed start of satellite non-emergency mode in hdden menu... 

Merge "[Satellite] Changed start of satellite non-emergency mode in hdden menu to use intent instead of directly invoking satellite manager" into main
parents c5112786 7f121ad2

core/res/AndroidManifest.xml

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

    <protected-broadcast android:name="android.service.ondeviceintelligence.MODEL_LOADED" />

    <protected-broadcast android:name="android.service.ondeviceintelligence.MODEL_UNLOADED" />

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





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

core/res/res/values/config_telephony.xml

+6 −0
Original line number Diff line number Diff line
@@ -472,4 +472,10 @@ 
    <integer name="config_mt_sms_polling_throttle_millis">300000</integer>

    <java-symbol type="integer" name="config_mt_sms_polling_throttle_millis" />





    <!-- The receiver class of the intent that hidden menu sends to start satellite non-emergency mode -->

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

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





</resources>

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

+10 −0
Original line number Diff line number Diff line
@@ -710,6 +710,16 @@ public final class SatelliteManager { 
    public static final String ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED =

            "android.telephony.action.ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED";





    /**

     * This intent will be broadcasted to start a non-emergency session.

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

     * config_satellite_carrier_roaming_non_emergency_session_class and package defined in

     * config_satellite_gateway_service_package

     * @hide

     */

    public static final String ACTION_SATELLITE_START_NON_EMERGENCY_SESSION =

            "android.telephony.action.ACTION_SATELLITE_START_NON_EMERGENCY_SESSION";

    /**

     * Meta-data represents whether the application supports P2P SMS over carrier roaming satellite

     * which needs manual trigger to connect to satellite. The messaging applications that supports