Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc9de754 authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

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

parents fcfff7a7 19afdba2

src/com/android/settings/network/telephony/MobileDataPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon 
    public int getAvailabilityStatus(int subId) {

        return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID

                ? AVAILABLE

                : DISABLED_DEPENDENT_SETTING;

                : AVAILABLE_UNSEARCHABLE;

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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;
@@ -88,10 +88,10 @@ public class MobileDataPreferenceControllerTest { 
    }



    @Test

    public void getAvailabilityStatus_invalidSubscription_returnDisabledDependentSetting() {

    public void getAvailabilityStatus_invalidSubscription_returnAvailableUnsearchable() {

        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);

    }



    @Test