From 9478be4fa756c2c0f4a23b26c2e32a07ed09ab6b Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 25 May 2021 08:57:52 +0800 Subject: [PATCH] Add more log for NetworkProviderWorker Bug: 183594909 Test: build pass Change-Id: I0b251df79c4db7e0b7eb5ab5338d43f238a3b50e --- .../network/telephony/NetworkProviderWorker.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/telephony/NetworkProviderWorker.java b/src/com/android/settings/network/telephony/NetworkProviderWorker.java index 698e779d8e6..c98bea374c2 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderWorker.java +++ b/src/com/android/settings/network/telephony/NetworkProviderWorker.java @@ -95,6 +95,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements @Override protected void onSlicePinned() { + Log.d(TAG, "onSlicePinned"); mMobileDataObserver.register(mContext, mDefaultDataSubid); mSubscriptionsListener.start(); mDataEnabledListener.start(mDefaultDataSubid); @@ -106,6 +107,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements @Override protected void onSliceUnpinned() { + Log.d(TAG, "onSliceUnpinned"); mMobileDataObserver.unregister(mContext); mSubscriptionsListener.stop(); mDataEnabledListener.stop(); @@ -136,10 +138,11 @@ public class NetworkProviderWorker extends WifiScanWorker implements @Override public void onSubscriptionsChanged() { int defaultDataSubId = getDefaultDataSubscriptionId(); - Log.d(TAG, "onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId); if (mDefaultDataSubid == defaultDataSubId) { + Log.d(TAG, "onSubscriptionsChanged: no change"); return; } + Log.d(TAG, "onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId); if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) { mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback); mMobileDataObserver.unregister(mContext); @@ -147,7 +150,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId)); mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId); mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback); - mMobileDataObserver.register(mContext, mDefaultDataSubid); + mMobileDataObserver.register(mContext, defaultDataSubId); mConfig = getConfig(mContext); } else { mSignalStrengthListener.updateSubscriptionIds(Collections.emptySet()); @@ -187,11 +190,13 @@ public class NetworkProviderWorker extends WifiScanWorker implements public DataContentObserver(Handler handler, NetworkProviderWorker backgroundWorker) { super(handler); + Log.d(TAG, "DataContentObserver: init"); mNetworkProviderWorker = backgroundWorker; } @Override public void onChange(boolean selfChange) { + Log.d(TAG, "DataContentObserver: onChange"); mNetworkProviderWorker.updateSlice(); } @@ -203,6 +208,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements */ public void register(Context context, int subId) { final Uri uri = MobileDataContentObserver.getObservableUri(context, subId); + Log.d(TAG, "DataContentObserver: register uri:" + uri); context.getContentResolver().registerContentObserver(uri, false, this); } @@ -212,6 +218,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements * @param context the Context object. */ public void unregister(Context context) { + Log.d(TAG, "DataContentObserver: unregister"); context.getContentResolver().unregisterContentObserver(this); } }