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

Commit 50e982d9 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Change action values in SatelliteManager" into main

parents 3e0579b5 286bee75

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -848,10 +848,10 @@ 
    <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="com.android.uwb.uwbcountrycode.GEOCODE_RETRY" />

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

    <protected-broadcast android:name="android.telephony.satellite.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" />

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





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

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

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ public final class SatelliteManager { 
     * @hide

     */

    public static final String ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED =

            "android.telephony.action.ACTION_SATELLITE_SUBSCRIBER_ID_LIST_CHANGED";

            "android.telephony.satellite.action.SATELLITE_SUBSCRIBER_ID_LIST_CHANGED";





    /**
@@ -757,7 +757,7 @@ public final class SatelliteManager { 
     * @hide

     */

    public static final String ACTION_SATELLITE_START_NON_EMERGENCY_SESSION =

            "android.telephony.action.ACTION_SATELLITE_START_NON_EMERGENCY_SESSION";

            "android.telephony.satellite.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