From f84f6e49eeb2502d88ae96aea0888ae1c5f054b3 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Mon, 20 Apr 2020 20:11:51 +0800
Subject: [PATCH] [Settings] Code refactor

Minor code refactor

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Merged-In: I060e7c880d91a0e5059610c5ceae319d47c19c7a
Change-Id: I378b3c7ad5531efd5f2dad4bdafbcddacaf66db4
---
 .../telephony/DataUsagePreferenceController.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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