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

Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e70590d8d29451f0906f09e3d90e847e74d9f7
This commit is contained in:
Zoey Chen
2021-03-09 11:21:49 +00:00
committed by Automerger Merge Worker
parent 6d5dc7b451 9abf2bff3b
commit 6003cb977f
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/network/AllowedNetworkTypesListener.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.network;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -28,14 +29,14 @@ import java.util.concurrent.Executor;
/**
* {@link PhoneStateListener} to listen to Allowed Network Types changed
* {@link TelephonyCallback} to listen to Allowed Network Types changed
*/
public class AllowedNetworkTypesListener extends PhoneStateListener implements
PhoneStateListener.AllowedNetworkTypesChangedListener {
public class AllowedNetworkTypesListener extends TelephonyCallback implements
TelephonyCallback.AllowedNetworkTypesListener {
private static final String LOG_TAG = "NetworkModeListener";
@VisibleForTesting
AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;
OnAllowedNetworkTypesListener mListener;
private long mAllowedNetworkType = -1;
private Executor mExecutor;
@@ -44,7 +45,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements
mExecutor = executor;
}
public void setAllowedNetworkTypesChangedListener(OnAllowedNetworkTypesChangedListener lsn) {
public void setAllowedNetworkTypesListener(OnAllowedNetworkTypesListener lsn) {
mListener = lsn;
}
@@ -56,7 +57,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements
public void register(Context context, int subId) {
TelephonyManager telephonyManager = context.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
telephonyManager.registerPhoneStateListener(mExecutor, this);
telephonyManager.registerTelephonyCallback(mExecutor, this);
}
/**
@@ -67,7 +68,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements
public void unregister(Context context, int subId) {
TelephonyManager telephonyManager = context.getSystemService(
TelephonyManager.class).createForSubscriptionId(subId);
telephonyManager.unregisterPhoneStateListener(this);
telephonyManager.unregisterTelephonyCallback(this);
}
@Override
@@ -84,7 +85,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements
/**
* Listener for update of Preferred Network Mode change
*/
public interface OnAllowedNetworkTypesChangedListener {
public interface OnAllowedNetworkTypesListener {
/**
* Notify the allowed network type changed.
*/

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

@@ -145,7 +145,7 @@ public class EnabledNetworkModePreferenceController extends
if (mAllowedNetworkTypesListener == null) {
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
mContext.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
}

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

@@ -45,7 +45,7 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
context.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
}

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

@@ -77,7 +77,7 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
if (mAllowedNetworkTypesListener == null) {
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
mContext.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
}
}

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

@@ -80,7 +80,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
mUiHandler = new Handler(Looper.getMainLooper());
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
new HandlerExecutor(mUiHandler));
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
}

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

@@ -60,7 +60,7 @@ public class OpenNetworkSelectPagePreferenceController extends
mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
context.getMainExecutor());
mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
() -> updatePreference());
}

10
tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java
View File

@@ -25,8 +25,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.HandlerExecutor;
import android.telephony.PhoneStateListener;
import android.telephony.RadioAccessFamily;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.test.mock.MockContentResolver;
@@ -53,7 +53,7 @@ public class AllowedNetworkTypesListenerTest {
private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
@Mock
private AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;
private AllowedNetworkTypesListener.OnAllowedNetworkTypesListener mListener;
@Mock
private TelephonyManager mTelephonyManager;
@@ -87,15 +87,15 @@ public class AllowedNetworkTypesListenerTest {
public void register_shouldRegisterContentObserver() {
mAllowedNetworkTypesListener.register(mContext, SUB_ID);
verify(mTelephonyManager, times(1)).registerPhoneStateListener(any(HandlerExecutor.class),
any(PhoneStateListener.class));
verify(mTelephonyManager, times(1)).registerTelephonyCallback(any(HandlerExecutor.class),
any(TelephonyCallback.class));
}
@Test
public void unregister_shouldUnregisterContentObserver() {
mAllowedNetworkTypesListener.unregister(mContext, SUB_ID);
verify(mTelephonyManager).unregisterPhoneStateListener(
verify(mTelephonyManager).unregisterTelephonyCallback(
mAllowedNetworkTypesListener);
}
}