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 "Listen to onExternalApplicationsAvailable in SatelliteAccessController" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-04-28 06:37:49 -07:00 • committed by Android (Google) Code Review
commit bc08a1ffcb
1 changed files with 78 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -433,6 +433,7 @@ class SatelliteAccessControllerTest {
.onUserAddedWithInstalledPackageList(PRIMARY_USER_HANDLE, listOf(packageInfo1))
mSatelliteAccessController.onPackageAdded(TEST_PACKAGE1, TEST_UID1)
mSatelliteAccessController.onPackageRemoved(TEST_PACKAGE1, TEST_UID1)
mSatelliteAccessController.onExternalApplicationsAvailable(arrayOf(SMS_APP1, SMS_APP2))
mSatelliteAccessController.onUserRemoved(PRIMARY_USER_HANDLE)
verify(mCallback, never()).accept(any(), any())
}
@ -483,4 +484,29 @@ class SatelliteAccessControllerTest {
mRoleHolderChangedListener.onRoleHoldersChanged(RoleManager.ROLE_SMS, PRIMARY_USER_HANDLE)
inOrder.verify(mCallback).accept(emptySet(), setOf(TEST_UID1, smsUid))
}
@FeatureFlag(name = CONSTRAINED_DATA_SATELLITE_OPTIN)
@Test
fun test_onExternalApplicationsAvailable() {
// Mock the sms apps as general opt-in apps without setting sms-role.
mockIsSatelliteDataOptimizedApp(SMS_APP1, true)
mockIsSatelliteDataOptimizedApp(SMS_APP2, true)
val inOrder = inOrder(mCallback)
mSatelliteAccessController
.onUserAddedWithInstalledPackageList(PRIMARY_USER_HANDLE, emptyList<PackageInfo>())
mSatelliteAccessController
.onUserAddedWithInstalledPackageList(
SECONDARY_USER_HANDLE,
emptyList<PackageInfo>()
)
mSatelliteAccessController.onExternalApplicationsAvailable(arrayOf(SMS_APP1, SMS_APP2))
inOrder.verify(mCallback).accept(emptySet(), setOf(
SMS_APP_ID1.toUid(PRIMARY_USER),
SMS_APP_ID1.toUid(SECONDARY_USER),
SMS_APP_ID2.toUid(PRIMARY_USER),
SMS_APP_ID2.toUid(SECONDARY_USER)
))
inOrder.verifyNoMoreInteractions()
}
}