From cc25130f6f7aa24613ec2efb7879e420b54ea58c Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Mon, 25 Jan 2021 12:50:09 +0800
Subject: [PATCH] [Telephony] Remove redundant code in PhoneStateListener

Bug: 178335048
Test: atest -c TelephonyManagerTest
Change-Id: Ic49d00c912bd4c5a6f770dc192667a21ec56d875
---
 .../android/telephony/PhoneStateListener.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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<PhysicalChannelConfig> 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) {