commit 5ce5110606f44d3d012f24b10ba92d8206443ee3
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 06 06:05:40 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 06 06:05:40 2016 +0000
tree ac1af16baba57b4a24a7558b17c48cb78f812517
parent a500d67ca13bb096bf7a8f3666c137b1f71b2eb9
parent b106d4b199e84a5a8f6f0309c86f2fab6fdd4816

Merge "Fix potential hang in getIccSimChallengeResponse"

src/java/com/android/internal/telephony/CallManager.java

diff --git a/src/java/com/android/internal/telephony/CallManager.java b/src/java/com/android/internal/telephony/CallManager.java
index f4e3dca..1c8ed62 100644
--- a/src/java/com/android/internal/telephony/CallManager.java
+++ b/src/java/com/android/internal/telephony/CallManager.java
@@ -677,7 +677,7 @@
     private void unregisterForPhoneStates(Phone phone) {
         // Make sure that we clean up our map of handlers to Phones.
         CallManagerHandler handler = mHandlerMap.get(phone);
-        if (handler != null) {
+        if (handler == null) {
             Rlog.e(LOG_TAG, "Could not find Phone handler for unregistration");
             return;
         }

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 0437c99..3a83d98 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -1175,6 +1175,9 @@
                     if (VDBG) log("REQ_SET_LINK_PROPERTIES_HTTP_PROXY proxy=" + proxy);
                     setLinkPropertiesHttpProxy(proxy);
                     mAc.replyToMessage(msg, DcAsyncChannel.RSP_SET_LINK_PROPERTIES_HTTP_PROXY);
+                    if(mNetworkAgent != null){
+                        mNetworkAgent.sendLinkProperties(mLinkProperties);
+                    }
                     break;
                 }
                 case DcAsyncChannel.REQ_GET_NETWORK_CAPABILITIES: {