PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Satellite UI updatable during receiving callback (Part II)

Browse Source 
- Refactor code
 - Make Satellite category and preference be updatable by callback.

Flag: EXEMPT bug fix
Fix: b/396233604
Fix: b/382664790
Test: atest pass
Change-Id: I55423317d82589312ce4a2f851b32b242529e922
This commit is contained in:
tom hsu
2025-02-17 17:25:04 +00:00
parent 048be18c5e
commit 9df2e6fdc9
2 changed files with 208 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
View File

@@ -16,29 +16,38 @@
package com.android.settings.network.telephony;
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC;
import static android.telephony.CarrierConfigManager.CARRIER_ROAMING_NTN_CONNECT_MANUAL;
import static android.telephony.CarrierConfigManager.KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_SUPPORTED_BOOL;
import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Looper;
import android.os.PersistableBundle;
import android.platform.test.annotations.EnableFlags;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.internal.telephony.flags.Flags;
import com.android.settings.network.CarrierConfigCache;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -50,8 +59,12 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
private CarrierConfigCache mCarrierConfigCache;
private Context mContext = null;
private SatelliteSettingsPreferenceCategoryController mController = null;
private PersistableBundle mPersistableBundle = new PersistableBundle();
@Before
public void setUp() {
@@ -59,27 +72,95 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
Looper.prepare();
}
mContext = spy(ApplicationProvider.getApplicationContext());
CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
mController = new SatelliteSettingsPreferenceCategoryController(mContext, KEY);
when(mCarrierConfigCache.getConfigForSubId(TEST_SUB_ID)).thenReturn(mPersistableBundle);
}
@Test
@Ignore("b/382664790")
public void getAvailabilityStatus_default_returnUnsupported() {
public void getAvailabilityStatus_deviceUnsupported_returnUnsupported() {
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@Ignore("b/382664790")
public void setPreferenceTitle_hasSmsService_showMessaging() {
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
preferenceCategory.setKey(KEY);
preferenceScreen.addPreference(preferenceCategory);
preferenceCategory.addPreference(new Preference(mContext));
mController.displayPreference(preferenceScreen);
public void getAvailabilityStatus_carrierNotSupport_returnUnsupported() {
mPersistableBundle.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);
mController.init(TEST_SUB_ID);
assertEquals(preferenceCategory.getTitle(), "Satellite connectivity");
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@EnableFlags({
Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG,
com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION
})
public void getAvailabilityStatus_sosSupported_returnAvailable() {
mPersistableBundle.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, true);
mPersistableBundle.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, true);
mController.init(TEST_SUB_ID);
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
@EnableFlags({
Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG,
com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION
})
public void getAvailabilityStatus_connectTypeAuto_returnAvailable() {
mPersistableBundle.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
mPersistableBundle.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, true);
mPersistableBundle.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC);
mController.init(TEST_SUB_ID);
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
@EnableFlags({
Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG,
com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION
})
public void getAvailabilityStatus_connectTypeManualAndAvailable_returnAvailable() {
mPersistableBundle.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
mPersistableBundle.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, true);
mPersistableBundle.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_AUTOMATIC);
mController.init(TEST_SUB_ID);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{SERVICE_TYPE_SMS});
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
@EnableFlags({
Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG,
com.android.settings.flags.Flags.FLAG_SATELLITE_OEM_SETTINGS_UX_MIGRATION
})
public void getAvailabilityStatus_connectTypeManualAndUnavailable_returnUnavailable() {
mPersistableBundle.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
mPersistableBundle.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, true);
mPersistableBundle.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT,
CARRIER_ROAMING_NTN_CONNECT_MANUAL);
mController.init(TEST_SUB_ID);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{});
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
}