Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 am: 0987923594 am: 209d3699b5

Change-Id: I7ed6f33c3b708ca676fde11ac5a23dbbd7d27302
This commit is contained in:
Bonian Chen
2020-04-21 08:49:03 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}