filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Get rid of deprecated PhoneStateListener

Browse Source 
TelephonyCallback is the new thing to use

Change-Id: I3c44210bfc02814af5d4110f507b94d0f0e8a4a0
This commit is contained in:
Michael W
2024-12-25 00:12:13 +01:00
parent 590243f8a8
commit 68a3707173
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/android/messaging/util/ConnectivityUtil.java
View File

@@ -18,10 +18,14 @@
package com.android.messaging.util;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.os.Handler;
import android.os.Looper;
import android.telephony.ServiceState;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import androidx.annotation.NonNull;
/**
* ConnectivityUtil listens to the network service state changes.
*/
@@ -30,6 +34,7 @@ public class ConnectivityUtil {
private volatile int mCurrentServiceState = ServiceState.STATE_POWER_OFF;
private final TelephonyManager mTelephonyManager;
private final Handler mHandler;
private ConnectivityListener mListener;
@@ -41,23 +46,10 @@ public class ConnectivityUtil {
mTelephonyManager =
((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE))
.createForSubscriptionId(subId);
mHandler = new Handler(Looper.getMainLooper());
}
private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
@Override
public void onServiceStateChanged(final ServiceState serviceState) {
if (mCurrentServiceState != serviceState.getState()) {
mCurrentServiceState = serviceState.getState();
onPhoneStateChanged(mCurrentServiceState);
}
}
@Override
public void onDataConnectionStateChanged(final int state) {
mCurrentServiceState = (state == TelephonyManager.DATA_DISCONNECTED) ?
ServiceState.STATE_OUT_OF_SERVICE : ServiceState.STATE_IN_SERVICE;
}
};
private final PhoneStateListener mPhoneStateListener = new PhoneStateListener();
private void onPhoneStateChanged(final int serviceState) {
final ConnectivityListener listener = mListener;
@@ -72,8 +64,8 @@ public class ConnectivityUtil {
if (mTelephonyManager != null) {
mCurrentServiceState = (PhoneUtils.getDefault().isAirplaneModeOn() ?
ServiceState.STATE_POWER_OFF : ServiceState.STATE_IN_SERVICE);
mTelephonyManager.listen(mPhoneStateListener,
PhoneStateListener.LISTEN_SERVICE_STATE);
mTelephonyManager.registerTelephonyCallback(mHandler::post,
mPhoneStateListener);
}
}
mListener = listener;
@@ -82,10 +74,28 @@ public class ConnectivityUtil {
public void unregister() {
if (mListener != null) {
if (mTelephonyManager != null) {
mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
mTelephonyManager.unregisterTelephonyCallback(mPhoneStateListener);
mCurrentServiceState = ServiceState.STATE_POWER_OFF;
}
}
mListener = null;
}
private class PhoneStateListener extends TelephonyCallback implements
TelephonyCallback.DataConnectionStateListener, TelephonyCallback.ServiceStateListener {
@Override
public void onDataConnectionStateChanged(int state, int networkType) {
mCurrentServiceState = (state == TelephonyManager.DATA_DISCONNECTED) ?
ServiceState.STATE_OUT_OF_SERVICE : ServiceState.STATE_IN_SERVICE;
}
@Override
public void onServiceStateChanged(@NonNull ServiceState serviceState) {
if (mCurrentServiceState != serviceState.getState()) {
mCurrentServiceState = serviceState.getState();
onPhoneStateChanged(mCurrentServiceState);
}
}
}
}