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

Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API"

Browse Source
This commit is contained in:
Bonian Chen
2020-04-08 06:40:10 +00:00
committed by Gerrit Code Review
parent ad360f14a6 d9957643d9
commit fe22ecad9b
5 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -268,7 +268,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
| PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
| PhoneStateListener.LISTEN_SERVICE_STATE);
mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);
mSubscriptionManager.addOnSubscriptionsChangedListener(
mContext.getMainExecutor(), mOnSubscriptionsChangedListener);
registerImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
if (mShowLatestAreaInfo) {

48
src/com/android/settings/network/ActiveSubsciptionsListener.java
View File

@@ -46,6 +46,26 @@ public abstract class ActiveSubsciptionsListener
private static final String TAG = "ActiveSubsciptions";
private static final boolean DEBUG = false;
private Looper mLooper;
private Context mContext;
private static final int STATE_NOT_LISTENING = 0;
private static final int STATE_STOPPING = 1;
private static final int STATE_PREPARING = 2;
private static final int STATE_LISTENING = 3;
private static final int STATE_DATA_CACHED = 4;
private AtomicInteger mCacheState;
private SubscriptionManager mSubscriptionManager;
private IntentFilter mSubscriptionChangeIntentFilter;
private BroadcastReceiver mSubscriptionChangeReceiver;
private static final int MAX_SUBSCRIPTION_UNKNOWN = -1;
private AtomicInteger mMaxActiveSubscriptionInfos;
private List<SubscriptionInfo> mCachedActiveSubscriptionInfo;
/**
* Constructor
*
@@ -93,26 +113,6 @@ public abstract class ActiveSubsciptionsListener
};
}
private Looper mLooper;
private Context mContext;
private static final int STATE_NOT_LISTENING = 0;
private static final int STATE_STOPPING = 1;
private static final int STATE_PREPARING = 2;
private static final int STATE_LISTENING = 3;
private static final int STATE_DATA_CACHED = 4;
private AtomicInteger mCacheState;
private SubscriptionManager mSubscriptionManager;
private IntentFilter mSubscriptionChangeIntentFilter;
private BroadcastReceiver mSubscriptionChangeReceiver;
private static final int MAX_SUBSCRIPTION_UNKNOWN = -1;
private AtomicInteger mMaxActiveSubscriptionInfos;
private List<SubscriptionInfo> mCachedActiveSubscriptionInfo;
/**
* Active subscriptions got changed
*/
@@ -266,6 +266,12 @@ public abstract class ActiveSubsciptionsListener
mCachedActiveSubscriptionInfo = null;
}
@VisibleForTesting
void registerForSubscriptionsChange() {
getSubscriptionManager().addOnSubscriptionsChangedListener(
mContext.getMainExecutor(), this);
}
private void monitorSubscriptionsChange(boolean on) {
if (on) {
if (!mCacheState.compareAndSet(STATE_NOT_LISTENING, STATE_PREPARING)) {
@@ -277,7 +283,7 @@ public abstract class ActiveSubsciptionsListener
}
mContext.registerReceiver(mSubscriptionChangeReceiver,
mSubscriptionChangeIntentFilter, null, new Handler(mLooper));
getSubscriptionManager().addOnSubscriptionsChangedListener(this);
registerForSubscriptionsChange();
mCacheState.compareAndSet(STATE_PREPARING, STATE_LISTENING);
return;
}

3
src/com/android/settings/network/SubscriptionsChangeListener.java
View File

@@ -67,7 +67,8 @@ public class SubscriptionsChangeListener extends ContentObserver {
}
public void start() {
mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionsChangedListener);
mSubscriptionManager.addOnSubscriptionsChangedListener(
mContext.getMainExecutor(), mSubscriptionsChangedListener);
mContext.getContentResolver()
.registerContentObserver(mAirplaneModeSettingUri, false, this);
final IntentFilter radioTechnologyChangedFilter = new IntentFilter(