From 9644782add244e582e4d219080c1865f97560d3b Mon Sep 17 00:00:00 2001
From: Megha Patil <meghapatil@google.com>
Date: Thu, 13 Apr 2023 20:45:34 +0000
Subject: [PATCH 1/2] 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
---
 core/java/android/provider/Settings.java                  | 2 ++
 .../android/telephony/satellite/SatelliteManager.java     | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4a46beb670de8..429d1dff0d632 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 431e9e6289623..fb46ff991d232 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 {}

From fd8ffe824d1d8ca631d4d950594c9904774f3731 Mon Sep 17 00:00:00 2001
From: Aishwarya Mallampati <amallampati@google.com>
Date: Mon, 1 May 2023 22:26:22 +0000
Subject: [PATCH 2/2] Updating Satellite Mode Key in Settings

When satellite is enabled by telephony (phone process) it needs to confirm that UWB gets disabled as well (UWB is listening for satellite enablement and disables itself). In order to register to get the UWB state states phone needs UWB_PRIVILEGED permission

Bug: 275415823
Test: atest SatelliteManagerTestOnMockService, Flashed on raven-userdebug: SMS and calls are working fine.
Change-Id: I82c906c429df8b763dea09b1ee249b09e22e26b6
---
 data/etc/privapp-permissions-platform.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 40cb7f2194e99..2f2cd885fe2e7 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -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">