Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace PendingIntent#getIntent" am: dd010bff79 am: 601630120d am: 22e1b06884 am: 36e01f7ff5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd8f46d7506713b4ee85d87cda37e324d4e6f961
This commit is contained in:
Paul Hu
2021-03-10 05:30:00 +00:00
committed by Automerger Merge Worker
parent 932438a9aa 36e01f7ff5
commit cfe0780f3d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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();
}
}