commit 16ceebd909e1765cebe127e6593db478c358b999
author qiangjiang <qiangjiang@google.com> Mon Oct 07 22:15:23 2024 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Oct 07 22:16:25 2024 +0000
tree 46cd9a114c6a13d0001ca5aa7cd62ec8947fe288
parent 91223a77515519f25baeedefe5fca7117b88f817

Fix remove alias issue

Flag: EXEMPT bugfix
Bug: 362422094
Test: atest com.android.server.wifi
Merged-In: Idfda276453b2e4d238011e88ef560ea33c0332bd
Change-Id: Idfda276453b2e4d238011e88ef560ea33c0332bd

service/java/com/android/server/wifi/aware/PairingConfigManager.java

diff --git a/service/java/com/android/server/wifi/aware/PairingConfigManager.java b/service/java/com/android/server/wifi/aware/PairingConfigManager.java
index a557022..c0ce760 100644
--- a/service/java/com/android/server/wifi/aware/PairingConfigManager.java
+++ b/service/java/com/android/server/wifi/aware/PairingConfigManager.java
@@ -186,11 +186,9 @@
     public void removePairedDevice(String packageName, String alias) {
         mAliasToNikMap.remove(alias);
         mAliasToSecurityInfoMap.remove(alias);
-        Set<String> aliasSet = mPerAppPairedAliasMap.remove(packageName);
-        if (aliasSet == null) {
-            return;
+        if (mPerAppPairedAliasMap.containsKey(packageName)) {
+            mPerAppPairedAliasMap.get(packageName).remove(alias);
         }
-        aliasSet.remove(alias);
     }
 
     /**