From 6a7af1cbbf615a2114603a5c828962a65443b930 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Wed, 25 Jan 2023 16:38:55 -0800 Subject: wakelock test: Use AServiceManager_waitForService AServiceManager_getService is deprecated. Bug: 264611736 Test: atest bluetooth_test_gd_unit Change-Id: Ie6fc9545a8c332ac0696988129b2e2faf7f293cc --- system/gd/Android.bp | 2 +- system/gd/os/android/wakelock_native_test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/gd/Android.bp b/system/gd/Android.bp index 5ae7827a54..0e21eecbf3 100644 --- a/system/gd/Android.bp +++ b/system/gd/Android.bp @@ -433,7 +433,7 @@ cc_test { sanitize: { address: true, }, - min_sdk_version: "30", + min_sdk_version: "Tiramisu", } cc_test { diff --git a/system/gd/os/android/wakelock_native_test.cc b/system/gd/os/android/wakelock_native_test.cc index 36f8af87d7..7bc7841a92 100644 --- a/system/gd/os/android/wakelock_native_test.cc +++ b/system/gd/os/android/wakelock_native_test.cc @@ -126,7 +126,7 @@ class WakelockNativeTest : public Test { WakelockNative::Get().Initialize(); - auto binder_raw = AServiceManager_getService("suspend_control"); + auto binder_raw = AServiceManager_waitForService("suspend_control"); ASSERT_NE(binder_raw, nullptr); binder.set(binder_raw); control_service_ = ISuspendControlService::fromBinder(binder); -- cgit v1.2.3-59-g8ed1b