From 0beea1e992197ca52cb871d27ccccc2f2857f907 Mon Sep 17 00:00:00 2001
From: Junyu Lai <junyulai@google.com>
Date: Wed, 30 Apr 2025 16:03:04 +0800
Subject: [PATCH] Read meta-data instead of property

Currently, the SatelliteAccessController checks if apps are
opt-in via a property tag under the application. This is
incorrect because PROPERTY_SATELLITE_DATA_OPTIMIZED is an
existing, released meta-data usage for Android B and needs
to be preserved.

Flag: EXEMPT flagged with a kill switch
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.SatelliteAccessControllerTest \
  --update-device
Bug: 410731080
Change-Id: If09890faf5d208d007179ecc29b7cf16f6fe6ebb
---
 .../SatelliteAccessController.java            | 19 ++++++++++++++-----
 .../SatelliteAccessControllerTest.kt          | 13 ++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/service/src/com/android/server/connectivity/SatelliteAccessController.java b/service/src/com/android/server/connectivity/SatelliteAccessController.java
index bbbd4aabea..10f61da088 100644
--- a/service/src/com/android/server/connectivity/SatelliteAccessController.java
+++ b/service/src/com/android/server/connectivity/SatelliteAccessController.java
@@ -28,6 +28,7 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -82,9 +83,10 @@ public class SatelliteAccessController {
     private final SparseArray<Set<Integer>> mSatelliteRoleSmsUids = new SparseArray<>();
 
     // Set of UIDs that have declared the
-    // {@code android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED} property
+    // {@code android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED} meta-data
     // with a value of package name in their manifest file. This variable will only be
     // accessed on the handler thread.
+    // See {@link SatelliteManager#PROPERTY_SATELLITE_DATA_OPTIMIZED}.
     private final Set<Integer> mSatelliteDataOptInUids = new ArraySet<>();
 
     private final ArrayMap<UserHandle, PackageManager> mUserPackageManagers = new ArrayMap<>();
@@ -402,16 +404,23 @@ public class SatelliteAccessController {
         final ArraySet<Integer> uids = new ArraySet<>();
         for (PackageInfo app : apps) {
             if (null == app.applicationInfo || app.applicationInfo.uid < 0) continue;
-            if (isSatelliteDataOptimizedApp(app.packageName)) uids.add(app.applicationInfo.uid);
+            if (isSatelliteDataOptimizedApp(app.packageName)) {
+                uids.add(app.applicationInfo.uid);
+            }
         }
         return uids;
     }
 
     private boolean isSatelliteDataOptimizedApp(@NonNull String packageName) {
         try {
-            final PackageManager.Property property = mPackageManager
-                    .getProperty(PROPERTY_SATELLITE_DATA_OPTIMIZED, packageName);
-            return property.isString() && TextUtils.equals(property.getString(), packageName);
+            final ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(
+                    packageName, PackageManager.GET_META_DATA);
+            final Bundle metaData = applicationInfo.metaData;
+            if (metaData != null) {
+                final String value = metaData.getString(PROPERTY_SATELLITE_DATA_OPTIMIZED);
+                return TextUtils.equals(value, packageName);
+            }
+            return false;
         } catch (PackageManager.NameNotFoundException e) {
             return false;
         }
diff --git a/tests/unit/java/com/android/server/connectivity/SatelliteAccessControllerTest.kt b/tests/unit/java/com/android/server/connectivity/SatelliteAccessControllerTest.kt
index 3bb1c92bf3..0b2e77f633 100644
--- a/tests/unit/java/com/android/server/connectivity/SatelliteAccessControllerTest.kt
+++ b/tests/unit/java/com/android/server/connectivity/SatelliteAccessControllerTest.kt
@@ -24,6 +24,7 @@ import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
+import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.UserHandle
@@ -356,15 +357,13 @@ class SatelliteAccessControllerTest {
     }
 
     private fun mockIsSatelliteDataOptimizedApp(packageName: String, isOptimized: Boolean) {
-        val property = mock(PackageManager.Property::class.java)
-        `when`(property.isString).thenReturn(isOptimized)
+        val appInfo = ApplicationInfo()
         if (isOptimized) {
-            `when`(property.string).thenReturn(packageName)
+            appInfo.metaData = Bundle()
+            appInfo.metaData.putString(PROPERTY_SATELLITE_DATA_OPTIMIZED, packageName)
         }
-        `when`(packageManager.getProperty(
-                eq(PROPERTY_SATELLITE_DATA_OPTIMIZED),
-                eq(packageName)
-        )).thenReturn(property)
+        doReturn(appInfo).`when`(packageManager)
+                .getApplicationInfo(packageName, PackageManager.GET_META_DATA)
     }
 
     @FeatureFlag(name = CONSTRAINED_DATA_SATELLITE_OPTIN)