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

Merge "Fix indexing error of mobile related controllers" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-14 05:04:46 +00:00
committed by Android (Google) Code Review
parent 765b71b9e8 1766b3c01d
commit f25450ef48
9 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/AirplaneModePreferenceController.java
View File

@@ -35,11 +35,11 @@ import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
public class AirplaneModePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause,
implements LifecycleObserver, OnStart, OnStop,
AirplaneModeEnabler.OnAirplaneModeChangedListener {
public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -120,16 +120,16 @@ public class AirplaneModePreferenceController extends TogglePreferenceController
}
@Override
public void onResume() {
public void onStart() {
if (isAvailable()) {
mAirplaneModeEnabler.resume();
mAirplaneModeEnabler.start();
}
}
@Override
public void onPause() {
public void onStop() {
if (isAvailable()) {
mAirplaneModeEnabler.pause();
mAirplaneModeEnabler.stop();
}
}

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

@@ -23,6 +23,7 @@ import android.content.IntentFilter;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
@@ -45,11 +46,11 @@ public class SubscriptionsChangeListener extends ContentObserver {
private BroadcastReceiver mBroadcastReceiver;
public SubscriptionsChangeListener(Context context, SubscriptionsChangeListenerClient client) {
super(new Handler());
super(new Handler(Looper.getMainLooper()));
mContext = context;
mClient = client;
mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
mSubscriptionsChangedListener = new OnSubscriptionsChangedListener() {
mSubscriptionsChangedListener = new OnSubscriptionsChangedListener(Looper.getMainLooper()) {
@Override
public void onSubscriptionsChanged() {
subscriptionsChangedCallback();

3
src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.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;
@@ -187,7 +188,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
private class PhoneCallStateListener extends PhoneStateListener {
PhoneCallStateListener() {
super();
super(Looper.getMainLooper());
}
private TelephonyManager mTelephonyManager;

3
src/com/android/settings/network/telephony/VideoCallingPreferenceController.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;
@@ -164,7 +165,7 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC
private class PhoneCallStateListener extends PhoneStateListener {
PhoneCallStateListener() {
super();
super(Looper.getMainLooper());
}
private TelephonyManager mTelephonyManager;

3
src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Looper;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telecom.PhoneAccountHandle;
@@ -194,7 +195,7 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
private class PhoneCallStateListener extends PhoneStateListener {
PhoneCallStateListener() {
super();
super(Looper.getMainLooper());
}
private TelephonyManager mTelephonyManager;