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

Commit 43a78331 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Code refactor" am: 2410478b 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393240

Change-Id: I6251d8ae967e6a29d5d85f6dfe62cd6316925ca2
parents 7b7b900f 2410478b

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

+6 −6
Original line number Diff line number Diff line
@@ -44,25 +44,25 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro 


    @Override

    public int getAvailabilityStatus(int subId) {

        return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID

        return (SubscriptionManager.isValidSubscriptionId(subId))

                ? AVAILABLE

                : AVAILABLE_UNSEARCHABLE;

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {

            mContext.startActivity(mIntent);

            return true;

        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {

            return false;

        }



        return false;

        mContext.startActivity(mIntent);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {

            preference.setEnabled(false);

            return;

        }