Merge "p2p: fix re-launch wpa_supplicant unintentionally" into rvc-dev

1 files changed, 2 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
index 7a363bf6e..2d0886188 100644
--- a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
+++ b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
@@ -106,7 +106,7 @@ public class SupplicantP2pIfaceHal {
             };
     private final DeathRecipient mSupplicantDeathRecipient =
             cookie -> {
-                Log.w(TAG, "ISupplicant/ISupplicantStaIface died: cookie=" + cookie);
+                Log.w(TAG, "ISupplicant/ISupplicantP2pIface died: cookie=" + cookie);
                 synchronized (mLock) {
                     supplicantServiceDiedHandler();
                 }
@@ -446,7 +446,7 @@ public class SupplicantP2pIfaceHal {
         synchronized (mLock) {
             try {
                 return android.hardware.wifi.supplicant.V1_1.ISupplicant.castFrom(
-                        ISupplicant.getService());
+                        mISupplicant);
             } catch (NoSuchElementException e) {
                 Log.e(TAG, "Failed to get ISupplicant", e);
                 return null;