Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36e01f7f authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace PendingIntent#getIntent" am: dd010bff am: 60163012 am: 22e1b068 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d5fd57b053418db5e7a2cbd48f23945b350ccc
parents 58ca793f 22e1b068

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

+1 −2
Original line number Diff line number Diff line
@@ -3614,11 +3614,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    // 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();

            }

        }