From 15baf7f6da0019f825b086ae0c857bd2c395cb09 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Wed, 16 Jan 2019 17:04:21 -0800
Subject: Invoke Both onDataConnectionStateChanged Methods

PhoneStateListener#onDataConnectionStateChanged is
overloaded to either take 1 or 2 parameters.

When receiving a callback from binder, the same call
should invoke both methods. sequentially.

Bug: 122274960
Test: atest PhoneStateListenerTest
Change-Id: I146f1eafa475969119254339d86b41244a96fb56
---
 telephony/java/android/telephony/PhoneStateListener.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index c81670139eae..9fee5932dadc 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -805,9 +805,11 @@ public class PhoneStateListener {
             PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
             if (psl == null) return;
 
-            Binder.withCleanCallingIdentity(
-                    () -> mExecutor.execute(
-                            () -> psl.onDataConnectionStateChanged(state, networkType)));
+            Binder.withCleanCallingIdentity(() -> mExecutor.execute(
+                    () -> {
+                        psl.onDataConnectionStateChanged(state, networkType);
+                        psl.onDataConnectionStateChanged(state);
+                    }));
         }
 
         public void onDataActivity(int direction) {
-- 
cgit v1.2.3-59-g8ed1b