Merge "[AWARE] Delete all possible NDIs - not just those framework thinks exists"

1 files changed, 7 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
index aa1771c60..e8d9c71bf 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareDataPathStateManager.java
@@ -169,7 +169,13 @@ public class WifiAwareDataPathStateManager {
     public void deleteAllInterfaces() {
         if (VDBG) Log.v(TAG, "deleteAllInterfaces");
 
-        for (String name : mInterfaces) {
+        if (mMgr.getCapabilities() == null) {
+            Log.e(TAG, "deleteAllInterfaces: capabilities aren't initialized yet!");
+            return;
+        }
+
+        for (int i = 0; i < mMgr.getCapabilities().maxNdiInterfaces; ++i) {
+            String name = AWARE_INTERFACE_PREFIX + i;
             mMgr.deleteDataPathInterface(name);
         }
     }