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

Mobile data should be non-indexable when the subscription id is invalid.

Browse Source 
Return AVAILABLE_UNSEARCHABLE when the subscription id is invalid.

Fixes: 141289758
Test: manual and robotests
Change-Id: I86534182fca26bf7b56ee1ee7d6f573a142a6a3a
This commit is contained in:
Stanley Wang
2019-09-20 10:23:00 +08:00
parent 03d6dad7d4
commit 19afdba261
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/MobileDataPreferenceController.java
View File

@@ -65,7 +65,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon
public int getAvailabilityStatus(int subId) { public int getAvailabilityStatus(int subId) {
return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
? AVAILABLE ? AVAILABLE
: DISABLED_DEPENDENT_SETTING; : AVAILABLE_UNSEARCHABLE;
} }
@Override @Override

6
tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.network.telephony; package com.android.settings.network.telephony;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -88,10 +88,10 @@ public class MobileDataPreferenceControllerTest {
} }
@Test @Test
public void getAvailabilityStatus_invalidSubscription_returnDisabledDependentSetting() { public void getAvailabilityStatus_invalidSubscription_returnAvailableUnsearchable() {
mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID); mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
} }
@Test @Test