summaryrefslogtreecommitdiff
path: root/hal/audio_perf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'hal/audio_perf.cpp')
-rw-r--r--hal/audio_perf.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/hal/audio_perf.cpp b/hal/audio_perf.cpp
index 4623f192..e2620a1b 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;
}