commit 2410478bee190916bdbc9920cd9483f3d27fa7dc
author Bonian Chen <bonianchen@google.com> Fri Aug 07 04:11:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 07 04:11:29 2020 +0000
tree 48a83440466287888f27e1cd4107971352bcb980
parent bb750ad2d72c3e1d6db5d5b9689d3522712fec9b
parent f84f6e49eeb2502d88ae96aea0888ae1c5f054b3

Merge "[Settings] Code refactor"

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

diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.java b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
index b8a31fe..d9617e6 100644
--- a/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
@@ -44,25 +44,25 @@
 
     @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;
         }