commit cf5984710dfa6840b6d41b36d9137fb60a5f13e2
author Clara Bayarri <clarabayarri@google.com> Tue Dec 15 14:14:34 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 15 14:14:34 2015 +0000
tree 1d2fc106d79bb1cd53b8f6882434b3c2e805aa2f
parent 16c9a107b594816ce56b397f0a454368d9e20b35
parent b3987bd7e9d9ed6e2b336c239b1d8019f8ffe073

Merge "Make ConfirmCredentials take user into account when creating intent"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index ed64c2b..65a27c8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -255,11 +255,6 @@
     private static final int EVENT_APPLY_GLOBAL_HTTP_PROXY = 9;
 
     /**
-     * used internally to send a sticky broadcast delayed.
-     */
-    private static final int EVENT_SEND_STICKY_BROADCAST_INTENT = 11;
-
-    /**
      * PAC manager has received new port.
      */
     private static final int EVENT_PROXY_HAS_CHANGED = 16;
@@ -2515,11 +2510,6 @@
                     handleDeprecatedGlobalHttpProxy();
                     break;
                 }
-                case EVENT_SEND_STICKY_BROADCAST_INTENT: {
-                    Intent intent = (Intent)msg.obj;
-                    sendStickyBroadcast(intent);
-                    break;
-                }
                 case EVENT_PROXY_HAS_CHANGED: {
                     handleApplyDefaultProxy((ProxyInfo)msg.obj);
                     break;