summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Megha Patil <meghapatil@google.com> 2023-04-13 20:45:34 +0000
committer Aishwarya Mallampati <amallampati@google.com> 2023-05-01 16:28:48 +0000
commit9644782add244e582e4d219080c1865f97560d3b (patch)
tree6b16e5560348d20ab10a0deb3712af74ba909494
parent8452c8833fc1278464bd871498e6fc0c91d81630 (diff)
Make SATELLITE_MODE_ENABLED Settings key as readable
- SATELLITE_MODE_ENABLED is made readable inorder for CTS to access Bug: b/277057547 Test: atest android.telephony.satellite.cts.SatelliteManagerTestOnMockService atest android.telephony.satellite.cts.SatelliteManagerTest Change-Id: I784a72f1b9e10fff7e3ae8b7e196e08fca365e75
-rw-r--r--core/java/android/provider/Settings.java2
-rw-r--r--telephony/java/android/telephony/satellite/SatelliteManager.java8
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4a46beb670de..429d1dff0d63 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -11819,6 +11819,7 @@ public final class Settings {
*
* {@hide}
*/
+ @Readable
public static final String SATELLITE_MODE_RADIOS = "satellite_mode_radios";
/**
@@ -11832,6 +11833,7 @@ public final class Settings {
*
* {@hide}
*/
+ @Readable
public static final String SATELLITE_MODE_ENABLED = "satellite_mode_enabled";
/**
diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java
index 431e9e628962..fb46ff991d23 100644
--- a/telephony/java/android/telephony/satellite/SatelliteManager.java
+++ b/telephony/java/android/telephony/satellite/SatelliteManager.java
@@ -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 {}