From 69fc8e0ccd7baee74d6fb8e715d4a4f0f1021f5c Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Mon, 28 Jun 2021 05:23:33 +0000 Subject: [PATCH] Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..." Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener Reason for revert: Build breakage. Reverted Changes: I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS... I15819472b:[Settings] Fix build breakage Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394 --- ...r.java => ActiveSubsciptionsListener.java} | 6 ++--- .../telephony/MobileNetworkSettings.java | 22 +++++++++---------- ...va => ActiveSubsciptionsListenerTest.java} | 10 ++++----- 3 files changed, 19 insertions(+), 19 deletions(-) rename src/com/android/settings/network/{ActiveSubscriptionsListener.java => ActiveSubsciptionsListener.java} (98%) rename tests/unit/src/com/android/settings/network/{ActiveSubscriptionsListenerTest.java => ActiveSubsciptionsListenerTest.java} (94%) diff --git a/src/com/android/settings/network/ActiveSubscriptionsListener.java b/src/com/android/settings/network/ActiveSubsciptionsListener.java similarity index 98% rename from src/com/android/settings/network/ActiveSubscriptionsListener.java rename to src/com/android/settings/network/ActiveSubsciptionsListener.java index 91a4c0a0de1..26f644145b2 100644 --- a/src/com/android/settings/network/ActiveSubscriptionsListener.java +++ b/src/com/android/settings/network/ActiveSubsciptionsListener.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * A listener for active subscription change */ -public abstract class ActiveSubscriptionsListener +public abstract class ActiveSubsciptionsListener extends SubscriptionManager.OnSubscriptionsChangedListener implements AutoCloseable { @@ -73,7 +73,7 @@ public abstract class ActiveSubscriptionsListener * @param looper {@code Looper} of this listener * @param context {@code Context} of this listener */ - public ActiveSubscriptionsListener(Looper looper, Context context) { + public ActiveSubsciptionsListener(Looper looper, Context context) { this(looper, context, SubscriptionManager.INVALID_SUBSCRIPTION_ID); } @@ -84,7 +84,7 @@ public abstract class ActiveSubscriptionsListener * @param context {@code Context} of this listener * @param subscriptionId for subscription on this listener */ - public ActiveSubscriptionsListener(Looper looper, Context context, int subscriptionId) { + public ActiveSubsciptionsListener(Looper looper, Context context, int subscriptionId) { super(looper); mLooper = looper; mContext = context; diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index adf399fb953..f54c18ba5d3 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -37,7 +37,7 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.datausage.BillingCyclePreferenceController; import com.android.settings.datausage.DataUsageSummaryPreferenceController; -import com.android.settings.network.ActiveSubscriptionsListener; +import com.android.settings.network.ActiveSubsciptionsListener; import com.android.settings.network.CarrierWifiTogglePreferenceController; import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController; import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController; @@ -74,9 +74,9 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { private UserManager mUserManager; private String mClickedPrefKey; - private ActiveSubscriptionsListener mActiveSubscriptionsListener; + private ActiveSubsciptionsListener mActiveSubsciptionsListener; private boolean mDropFirstSubscriptionChangeNotify; - private int mActiveSubscriptionsListenerCount; + private int mActiveSubsciptionsListenerCount; public MobileNetworkSettings() { super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS); @@ -218,8 +218,8 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { super.onResume(); // TODO: remove log after fixing b/182326102 Log.d(LOG_TAG, "onResume() subId=" + mSubId); - if (mActiveSubscriptionsListener == null) { - mActiveSubscriptionsListener = new ActiveSubscriptionsListener( + if (mActiveSubsciptionsListener == null) { + mActiveSubsciptionsListener = new ActiveSubsciptionsListener( getContext().getMainLooper(), getContext(), mSubId) { public void onChanged() { onSubscriptionDetailChanged(); @@ -227,7 +227,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { }; mDropFirstSubscriptionChangeNotify = true; } - mActiveSubscriptionsListener.start(); + mActiveSubsciptionsListener.start(); } private void onSubscriptionDetailChanged() { @@ -236,21 +236,21 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { Log.d(LOG_TAG, "Callback during onResume()"); return; } - mActiveSubscriptionsListenerCount++; - if (mActiveSubscriptionsListenerCount != 1) { + mActiveSubsciptionsListenerCount++; + if (mActiveSubsciptionsListenerCount != 1) { return; } ThreadUtils.postOnMainThread(() -> { - mActiveSubscriptionsListenerCount = 0; + mActiveSubsciptionsListenerCount = 0; redrawPreferenceControllers(); }); } @Override public void onDestroy() { - if (mActiveSubscriptionsListener != null) { - mActiveSubscriptionsListener.stop(); + if (mActiveSubsciptionsListener != null) { + mActiveSubsciptionsListener.stop(); } super.onDestroy(); } diff --git a/tests/unit/src/com/android/settings/network/ActiveSubscriptionsListenerTest.java b/tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java similarity index 94% rename from tests/unit/src/com/android/settings/network/ActiveSubscriptionsListenerTest.java rename to tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java index 27bc40c4847..efa21ae6bba 100644 --- a/tests/unit/src/com/android/settings/network/ActiveSubscriptionsListenerTest.java +++ b/tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(AndroidJUnit4.class) -public class ActiveSubscriptionsListenerTest { +public class ActiveSubsciptionsListenerTest { private static final int SUB_ID1 = 3; private static final int SUB_ID2 = 7; @@ -68,7 +68,7 @@ public class ActiveSubscriptionsListenerTest { private SubscriptionManager mSubscriptionManager; private List mActiveSubscriptions; - private ActiveSubscriptionsListenerImpl mListener; + private ActiveSubsciptionsListenerImpl mListener; private BroadcastReceiver mReceiver; @Before @@ -83,7 +83,7 @@ public class ActiveSubscriptionsListenerTest { addMockSubscription(SUB_ID2); doReturn(mActiveSubscriptions).when(mSubscriptionManager).getActiveSubscriptionInfoList(); - mListener = spy(new ActiveSubscriptionsListenerImpl(Looper.getMainLooper(), mContext)); + mListener = spy(new ActiveSubsciptionsListenerImpl(Looper.getMainLooper(), mContext)); doReturn(mSubscriptionManager).when(mListener).getSubscriptionManager(); mReceiver = mListener.getSubscriptionChangeReceiver(); } @@ -99,8 +99,8 @@ public class ActiveSubscriptionsListenerTest { mListener.close(); } - public class ActiveSubscriptionsListenerImpl extends ActiveSubscriptionsListener { - public ActiveSubscriptionsListenerImpl(Looper looper, Context context) { + public class ActiveSubsciptionsListenerImpl extends ActiveSubsciptionsListener { + public ActiveSubsciptionsListenerImpl(Looper looper, Context context) { super(looper, context); }