commit 6ae3110de35a1e43fe2686dcedf211847b4c7567
author Paul Hu <paulhu@google.com> Wed Mar 10 04:32:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 10 04:32:26 2021 +0000
tree 7362028866816f7e1d44d6a184ea1ae9a42fa828
parent 5962bf322bbfc15d17b51111b5d1f4b1012cf111
parent c80147e92b0ce6310151ff5c4e0920117e64d2d4

Merge "Replace PendingIntent#getIntent" am: e0b54f9303 am: c80147e92b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f4cb9ff8e42373e7ebf71b3d4559b768ebfdbe7

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 ce3a38c..07b473c 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3614,11 +3614,10 @@
     // pendingIntent => NetworkRequestInfo map.
     // This method assumes that every non-null PendingIntent maps to exactly 1 NetworkRequestInfo.
     private NetworkRequestInfo findExistingNetworkRequestInfo(PendingIntent pendingIntent) {
-        Intent intent = pendingIntent.getIntent();
         for (Map.Entry<NetworkRequest, NetworkRequestInfo> entry : mNetworkRequests.entrySet()) {
             PendingIntent existingPendingIntent = entry.getValue().mPendingIntent;
             if (existingPendingIntent != null &&
-                    existingPendingIntent.getIntent().filterEquals(intent)) {
+                    existingPendingIntent.intentFilterEquals(pendingIntent)) {
                 return entry.getValue();
             }
         }