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

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

Merge changes from topic "SatelliteModeSettingsRadios" into udc-dev 

* changes:
  Updating Satellite Mode Key in Settings
  Make SATELLITE_MODE_ENABLED Settings key as readable
parents 8858aacd fd8ffe82

core/java/android/provider/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -11838,6 +11838,7 @@ public final class Settings { 
         *

         * {@hide}

         */

        @Readable

        public static final String SATELLITE_MODE_RADIOS = "satellite_mode_radios";















        /**









@@ -11851,6 +11852,7 @@ public final class Settings {













         *















         * {@hide}















         */













        @Readable















        public static final String SATELLITE_MODE_ENABLED = "satellite_mode_enabled";





























        /**

































data/etc/privapp-permissions-platform.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -166,6 +166,7 @@ applications that come with the platform













        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>















        <permission name="android.permission.LOG_COMPAT_CHANGE"/>















        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>













        <permission name="android.permission.UWB_PRIVILEGED"/>















    </privapp-permissions>































    <privapp-permissions package="com.android.providers.calendar">

































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



+7
−1




























Original line number
Diff line number
Diff line








@@ -273,6 +273,11 @@ public class SatelliteManager {













     */















    public static final int SATELLITE_NOT_SUPPORTED = 20;





























    /**













     * The current request is already in-progress.













     */













    public static final int SATELLITE_REQUEST_IN_PROGRESS = 21;





























    /** @hide */















    @IntDef(prefix = {"SATELLITE_"}, value = {















            SATELLITE_ERROR_NONE,









@@ -295,7 +300,8 @@ public class SatelliteManager {













            SATELLITE_NETWORK_TIMEOUT,















            SATELLITE_NOT_REACHABLE,















            SATELLITE_NOT_AUTHORIZED,













            SATELLITE_NOT_SUPPORTED













            SATELLITE_NOT_SUPPORTED,













            SATELLITE_REQUEST_IN_PROGRESS















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface SatelliteError {}