commit e4b30ff17d37c7523bb00802abf9a335293ae077
author Hakjun Choi <hakjunc@google.com> Wed Jan 10 02:58:09 2024 +0000
committer Hakjun Choi <hakjunc@google.com> Fri Jan 19 07:17:42 2024 +0000
tree 16a9d773201c8f6ce675dd3d243bbe67e2f71407
parent ecd3f7dd058a22778a018bd8e6508c69569fe491

Added an intent action key for carrier satellite service

Added a Intent action ACTION_SATELLITE_MESSAGING to provide a way to
   direct jump to Satellite Settings activity - carrier requirement

Bug: 319035517
Test: manual test using pixel device
Test: atest settingActivity_launchSatelliteSettingIntent

Change-Id: I217f2e3d429a6bd2a0ce9969956d970357888533

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 40dcc42..0726510 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -36578,6 +36578,7 @@
     field @FlaggedApi("com.android.media.flags.enable_privileged_routing_for_media_routing_control") public static final String ACTION_REQUEST_MEDIA_ROUTING_CONTROL = "android.settings.REQUEST_MEDIA_ROUTING_CONTROL";
     field public static final String ACTION_REQUEST_SCHEDULE_EXACT_ALARM = "android.settings.REQUEST_SCHEDULE_EXACT_ALARM";
     field public static final String ACTION_REQUEST_SET_AUTOFILL_SERVICE = "android.settings.REQUEST_SET_AUTOFILL_SERVICE";
+    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String ACTION_SATELLITE_SETTING = "android.settings.SATELLITE_SETTING";
     field public static final String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
     field public static final String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
     field public static final String ACTION_SETTINGS = "android.settings.SETTINGS";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 58159c2..ffbc889 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -138,6 +138,20 @@
     public static final String ACTION_SETTINGS = "android.settings.SETTINGS";
 
     /**
+     * Activity Action: Show settings to provide guide about carrier satellite messaging.
+     * <p>
+     * In some cases, a matching Activity may not exist, so ensure you
+     * safeguard against this.
+     * <p>
+     * Input: Nothing.
+     * <p>
+     * Output: Nothing.
+     */
+    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)
+    public static final String ACTION_SATELLITE_SETTING = "android.settings.SATELLITE_SETTING";
+
+    /**
      * Activity Action: Show settings to allow configuration of APNs.
      * <p>
      * Input: Nothing.