joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Search for the satellite opt-in flag in disabled services" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-07-14 20:41:48 -07:00 • committed by Android (Google) Code Review
commit c5cda84789
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
service/src/com/android/server/connectivity/SatelliteAccessController.java
View file

@ -448,8 +448,9 @@ public class SatelliteAccessController {
// Then check meta-data under service tags.
final PackageInfo packageInfo = pmForUser.getPackageInfo(
packageName, PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
if (packageInfo.services != null) {
packageName, PackageManager.GET_SERVICES | PackageManager.GET_META_DATA
| PackageManager.MATCH_DISABLED_COMPONENTS);
if (packageInfo != null && packageInfo.services != null) {
for (ServiceInfo serviceInfo : packageInfo.services) {
if (isSatelliteDataOptimizedMetaData(serviceInfo.metaData, packageName)) {
return true;

13
tests/unit/java/com/android/server/connectivity/SatelliteAccessControllerTest.kt
View file

@ -396,7 +396,10 @@ class SatelliteAccessControllerTest {
.getApplicationInfo(TEST_PACKAGE1, PackageManager.GET_META_DATA)
doReturn(PackageInfo()).`when`(pm).getPackageInfo(
eq(TEST_PACKAGE1),
eq(PackageManager.GET_SERVICES or PackageManager.GET_META_DATA)
eq(
PackageManager.GET_SERVICES or PackageManager.GET_META_DATA or
PackageManager.MATCH_DISABLED_COMPONENTS
)
)
onPackageAdded(TEST_PACKAGE1, TEST_UID1)
verify(callback, never()).accept(any(), any())
@ -428,7 +431,8 @@ class SatelliteAccessControllerTest {
packageInfo.services = arrayOf(serviceInfo)
doReturn(packageInfo).`when`(pm).getPackageInfo(
TEST_PACKAGE1,
PackageManager.GET_SERVICES or PackageManager.GET_META_DATA
PackageManager.GET_SERVICES or PackageManager.GET_META_DATA or
PackageManager.MATCH_DISABLED_COMPONENTS
)
onPackageAdded(TEST_PACKAGE1, TEST_UID1)
@ -445,7 +449,10 @@ class SatelliteAccessControllerTest {
packageInfo.services = arrayOf(serviceInfo)
doReturn(packageInfo).`when`(pm).getPackageInfo(
eq(TEST_PACKAGE1),
eq(PackageManager.GET_SERVICES or PackageManager.GET_META_DATA)
eq(
PackageManager.GET_SERVICES or PackageManager.GET_META_DATA or
PackageManager.MATCH_DISABLED_COMPONENTS
)
)
onPackageAdded(TEST_PACKAGE1, TEST_UID1)
verify(callback, never()).accept(any(), any())