Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I7ed6f33c3b708ca676fde11ac5a23dbbd7d27302
This commit is contained in:
Bonian Chen
2020-04-21 08:49:03 +00:00
committed by Automerger Merge Worker
parent 4bd1192f75 209d3699b5
commit c827609e3e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/telephony/DataUsagePreferenceController.java
View File

@@ -44,25 +44,25 @@ public class DataUsagePreferenceController extends TelephonyBasePreferenceContro
@Override @Override
public int getAvailabilityStatus(int subId) { public int getAvailabilityStatus(int subId) {
return subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID return (SubscriptionManager.isValidSubscriptionId(subId))
? AVAILABLE ? AVAILABLE
: AVAILABLE_UNSEARCHABLE; : AVAILABLE_UNSEARCHABLE;
} }
@Override @Override
public boolean handlePreferenceTreeClick(Preference preference) { public boolean handlePreferenceTreeClick(Preference preference) {
if (TextUtils.equals(preference.getKey(), getPreferenceKey())) { if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
mContext.startActivity(mIntent); return false;
return true;
} }
return false; mContext.startActivity(mIntent);
return true;
} }
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
preference.setEnabled(false); preference.setEnabled(false);
return; return;
} }