Probe PowerHAL HIDL first am: b8c5a0f936

Change-Id: Ie8f561e9fa8e3de982509a4e8d297ae774f0a3fd

1 files changed, 15 insertions, 15 deletions

diff --git a/hal/audio_perf.cpp b/hal/audio_perf.cpp
index 4623f19..e2620a1 100644
--- a/hal/audio_perf.cpp
+++ b/hal/audio_perf.cpp
@@ -54,6 +54,21 @@ static hal_version connectPowerHalLocked() {
         return NONE;
     }
 
+    if (gPowerHalHidlExists) {
+        // (re)connect if handle is null
+        if (!gPowerHal_1_2_) {
+            gPowerHal_1_2_ =
+                    android::hardware::power::V1_2::IPower::getService();
+        }
+        if (gPowerHal_1_2_) {
+            ALOGI("Successfully connected to Power Hal Hidl service.");
+            return HIDL_1_2;
+        } else {
+            // no more try on this handle
+            gPowerHalHidlExists = false;
+        }
+    }
+
     if (gPowerHalAidlExists) {
         // (re)connect if handle is null
         if (!gPowerHal_Aidl_) {
@@ -70,21 +85,6 @@ static hal_version connectPowerHalLocked() {
         }
     }
 
-    if (gPowerHalHidlExists) {
-        // (re)connect if handle is null
-        if (!gPowerHal_1_2_) {
-            gPowerHal_1_2_ =
-                    android::hardware::power::V1_2::IPower::getService();
-        }
-        if (gPowerHal_1_2_) {
-            ALOGI("Successfully connected to Power Hal Hidl service.");
-            return HIDL_1_2;
-        } else {
-            // no more try on this handle
-            gPowerHalHidlExists = false;
-        }
-    }
-
     return NONE;
 }