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

Merge "Use main looper for PhoneStateListener"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-22 19:57:35 +00:00
committed by Android (Google) Code Review
parent 0a546d1916 6ac8d80fcb
commit f3fb639f49
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/CarrierPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.network.telephony;
import android.content.Context;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -37,6 +38,7 @@ public class CarrierPreferenceController extends BasePreferenceController {
public CarrierPreferenceController(Context context, String key) {
super(context, key);
mCarrierConfigManager = new CarrierConfigManager(context);
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
public void init(int subId) {

1
src/com/android/settings/network/telephony/DataUsagePreferenceController.java
View File

@@ -43,6 +43,7 @@ public class DataUsagePreferenceController extends BasePreferenceController {
public DataUsagePreferenceController(Context context, String key) {
super(context, key);
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
@Override

8
src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.network.telephony;
import android.content.Context;
import android.os.Looper;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
@@ -53,7 +54,7 @@ public class Enhanced4gLtePreferenceController extends TogglePreferenceControlle
public Enhanced4gLtePreferenceController(Context context, String key) {
super(context, key);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mPhoneStateListener = new PhoneCallStateListener();
mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper());
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
@@ -131,6 +132,11 @@ public class Enhanced4gLtePreferenceController extends TogglePreferenceControlle
}
private class PhoneCallStateListener extends PhoneStateListener {
public PhoneCallStateListener(Looper looper) {
super(looper);
}
@Override
public void onCallStateChanged(int state, String incomingNumber) {
updateState(mPreference);

1
src/com/android/settings/network/telephony/MobileDataPreferenceController.java
View File

@@ -61,6 +61,7 @@ public class MobileDataPreferenceController extends TogglePreferenceController
super(context, key);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
@Override

1
src/com/android/settings/network/telephony/RoamingPreferenceController.java
View File

@@ -61,6 +61,7 @@ public class RoamingPreferenceController extends TogglePreferenceController impl
super(context, key);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
@Override