PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more log for NetworkProviderWorker" into sc-dev

Browse Source
This commit is contained in:
SongFerng Wang
2021-05-25 06:23:33 +00:00
committed by Android (Google) Code Review
parent cd5722f8a1 9478be4fa7
commit 3a55bed8a1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/network/telephony/NetworkProviderWorker.java
View File

@@ -97,6 +97,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
@Override @Override
protected void onSlicePinned() { protected void onSlicePinned() {
Log.d(TAG, "onSlicePinned");
mMobileDataObserver.register(mContext, mDefaultDataSubid); mMobileDataObserver.register(mContext, mDefaultDataSubid);
mSubscriptionsListener.start(); mSubscriptionsListener.start();
mDataEnabledListener.start(mDefaultDataSubid); mDataEnabledListener.start(mDefaultDataSubid);
@@ -108,6 +109,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
@Override @Override
protected void onSliceUnpinned() { protected void onSliceUnpinned() {
Log.d(TAG, "onSliceUnpinned");
mMobileDataObserver.unregister(mContext); mMobileDataObserver.unregister(mContext);
mSubscriptionsListener.stop(); mSubscriptionsListener.stop();
mDataEnabledListener.stop(); mDataEnabledListener.stop();
@@ -138,10 +140,11 @@ public class NetworkProviderWorker extends WifiScanWorker implements
@Override @Override
public void onSubscriptionsChanged() { public void onSubscriptionsChanged() {
int defaultDataSubId = getDefaultDataSubscriptionId(); int defaultDataSubId = getDefaultDataSubscriptionId();
Log.d(TAG, "onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId);
if (mDefaultDataSubid == defaultDataSubId) { if (mDefaultDataSubid == defaultDataSubId) {
Log.d(TAG, "onSubscriptionsChanged: no change");
return; return;
} }
Log.d(TAG, "onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId);
if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) { if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) {
mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback); mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
mMobileDataObserver.unregister(mContext); mMobileDataObserver.unregister(mContext);
@@ -149,7 +152,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId)); mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId));
mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId); mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId);
mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback); mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback);
mMobileDataObserver.register(mContext, mDefaultDataSubid); mMobileDataObserver.register(mContext, defaultDataSubId);
mConfig = getConfig(mContext); mConfig = getConfig(mContext);
} else { } else {
mSignalStrengthListener.updateSubscriptionIds(Collections.emptySet()); mSignalStrengthListener.updateSubscriptionIds(Collections.emptySet());
@@ -189,11 +192,13 @@ public class NetworkProviderWorker extends WifiScanWorker implements
public DataContentObserver(Handler handler, NetworkProviderWorker backgroundWorker) { public DataContentObserver(Handler handler, NetworkProviderWorker backgroundWorker) {
super(handler); super(handler);
Log.d(TAG, "DataContentObserver: init");
mNetworkProviderWorker = backgroundWorker; mNetworkProviderWorker = backgroundWorker;
} }
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
Log.d(TAG, "DataContentObserver: onChange");
mNetworkProviderWorker.updateSlice(); mNetworkProviderWorker.updateSlice();
} }
@@ -205,6 +210,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
*/ */
public void register(Context context, int subId) { public void register(Context context, int subId) {
final Uri uri = MobileDataContentObserver.getObservableUri(context, subId); final Uri uri = MobileDataContentObserver.getObservableUri(context, subId);
Log.d(TAG, "DataContentObserver: register uri:" + uri);
context.getContentResolver().registerContentObserver(uri, false, this); context.getContentResolver().registerContentObserver(uri, false, this);
} }
@@ -214,6 +220,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
* @param context the Context object. * @param context the Context object.
*/ */
public void unregister(Context context) { public void unregister(Context context) {
Log.d(TAG, "DataContentObserver: unregister");
context.getContentResolver().unregisterContentObserver(this); context.getContentResolver().unregisterContentObserver(this);
} }
} }