SetupWizard: Turn off signal strength listener prior to detach
Change-Id: I4c4b4a3e82067704b6895b9d46997d6e72b38786
This commit is contained in:
parent
d28a24dfa2
commit
3ce798f2ba
|
@ -150,10 +150,10 @@ public class ChooseDataSimPage extends SetupPage {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDetach() {
|
public void onDetach() {
|
||||||
super.onDetach();
|
|
||||||
for (int i = 0; i < mPhoneStateListeners.size(); i++) {
|
for (int i = 0; i < mPhoneStateListeners.size(); i++) {
|
||||||
mPhone.listen(mPhoneStateListeners.get(i), PhoneStateListener.LISTEN_NONE);
|
mPhone.listen(mPhoneStateListeners.get(i), PhoneStateListener.LISTEN_NONE);
|
||||||
}
|
}
|
||||||
|
super.onDetach();
|
||||||
}
|
}
|
||||||
|
|
||||||
private PhoneStateListener createPhoneStateListener(final SubInfoRecord subInfoRecord) {
|
private PhoneStateListener createPhoneStateListener(final SubInfoRecord subInfoRecord) {
|
||||||
|
|
|
@ -83,12 +83,14 @@ public class MobileDataPage extends SetupPage {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSignalStrengthsChanged(SignalStrength signalStrength) {
|
public void onSignalStrengthsChanged(SignalStrength signalStrength) {
|
||||||
|
if (isDetached()) return;
|
||||||
mSignalStrength = signalStrength;
|
mSignalStrength = signalStrength;
|
||||||
updateSignalStrength();
|
updateSignalStrength();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onServiceStateChanged(ServiceState state) {
|
public void onServiceStateChanged(ServiceState state) {
|
||||||
|
if (isDetached()) return;
|
||||||
mServiceState = state;
|
mServiceState = state;
|
||||||
updateSignalStrength();
|
updateSignalStrength();
|
||||||
}
|
}
|
||||||
|
@ -138,11 +140,12 @@ public class MobileDataPage extends SetupPage {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDetach() {
|
public void onDetach() {
|
||||||
super.onDetach();
|
|
||||||
mPhone.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
|
mPhone.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
|
||||||
|
super.onDetach();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateCarrierText() {
|
private void updateCarrierText() {
|
||||||
|
if (isDetached()) return;
|
||||||
String name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
|
String name = mPhone.getNetworkOperatorName(SubscriptionManager.getDefaultDataSubId());
|
||||||
if (TextUtils.isEmpty(name)) {
|
if (TextUtils.isEmpty(name)) {
|
||||||
if (mServiceState != null && mServiceState.isEmergencyOnly()) {
|
if (mServiceState != null && mServiceState.isEmergencyOnly()) {
|
||||||
|
@ -155,6 +158,7 @@ public class MobileDataPage extends SetupPage {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateSignalStrength() {
|
private void updateSignalStrength() {
|
||||||
|
if (isDetached()) return;
|
||||||
if (!hasService()) {
|
if (!hasService()) {
|
||||||
mSignalView.setImageResource(R.drawable.ic_signal_no_signal);
|
mSignalView.setImageResource(R.drawable.ic_signal_no_signal);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue