diff --git a/core/java/android/telephony/PhoneStateListener.java b/core/java/android/telephony/PhoneStateListener.java index 285b8aa4176a6..334687549d719 100644 --- a/core/java/android/telephony/PhoneStateListener.java +++ b/core/java/android/telephony/PhoneStateListener.java @@ -2841,7 +2841,6 @@ public class PhoneStateListener { } public void onPhysicalChannelConfigChanged(List configs) { - PhoneStateListener psl = mPhoneStateListenerWeakRef.get(); PhysicalChannelConfigChangedListener listener = (PhysicalChannelConfigChangedListener) mPhoneStateListenerWeakRef.get(); if (listener == null) return; @@ -2852,15 +2851,13 @@ public class PhoneStateListener { } public void onDataEnabledChanged(boolean enabled, @DataEnabledReason int reason) { - if ((mPhoneStateListenerWeakRef.get() instanceof DataEnabledChangedListener)) { - DataEnabledChangedListener listener = - (DataEnabledChangedListener) mPhoneStateListenerWeakRef.get(); - if (listener == null) return; + DataEnabledChangedListener listener = + (DataEnabledChangedListener) mPhoneStateListenerWeakRef.get(); + if (listener == null) return; - Binder.withCleanCallingIdentity( - () -> mExecutor.execute(() -> listener.onDataEnabledChanged( - enabled, reason))); - } + Binder.withCleanCallingIdentity( + () -> mExecutor.execute(() -> listener.onDataEnabledChanged( + enabled, reason))); } public void onAllowedNetworkTypesChanged(Map allowedNetworkTypesList) {