diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-01-30 02:48:00 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2022-01-30 03:00:47 +0000 |
| commit | a028272dee9220e6810cbdcfb2328c34f8afe4c2 (patch) | |
| tree | 67574a4494f5fccdb37925294b32d5b62642fa4d /power | |
| parent | c8ad7b85d490d5c925d708f36f4dd74a64e591be (diff) | |
| parent | 8338316c8344ab2707b6572e34e42e5fca9f9ee9 (diff) | |
Merge TP1A.220107.002
Change-Id: I655d5412ccd734059dfb19075bb9abc810396975
Diffstat (limited to 'power')
| -rw-r--r-- | power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/Mode.aidl | 1 | ||||
| -rw-r--r-- | power/aidl/android/hardware/power/Mode.aidl | 5 | ||||
| -rw-r--r-- | power/aidl/default/Android.bp | 2 | ||||
| -rw-r--r-- | power/aidl/default/main.cpp | 2 | ||||
| -rw-r--r-- | power/aidl/default/power-default.xml | 2 | ||||
| -rw-r--r-- | power/stats/aidl/default/main.cpp | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/Mode.aidl b/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/Mode.aidl index 8920c014e3..ba444a7081 100644 --- a/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/Mode.aidl +++ b/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/Mode.aidl @@ -49,4 +49,5 @@ enum Mode { CAMERA_STREAMING_LOW = 12, CAMERA_STREAMING_MID = 13, CAMERA_STREAMING_HIGH = 14, + GAME_LOADING = 15, } diff --git a/power/aidl/android/hardware/power/Mode.aidl b/power/aidl/android/hardware/power/Mode.aidl index ae113e3799..2ebace103f 100644 --- a/power/aidl/android/hardware/power/Mode.aidl +++ b/power/aidl/android/hardware/power/Mode.aidl @@ -162,4 +162,9 @@ enum Mode { * This hint indicates that camera high resolution stream is being started. */ CAMERA_STREAMING_HIGH, + + /** + * This mode indicates that the user is waiting for loading in a game. + */ + GAME_LOADING, } diff --git a/power/aidl/default/Android.bp b/power/aidl/default/Android.bp index 9acb9e044e..223b9d5e6b 100644 --- a/power/aidl/default/Android.bp +++ b/power/aidl/default/Android.bp @@ -30,7 +30,7 @@ cc_binary { shared_libs: [ "libbase", "libbinder_ndk", - "android.hardware.power-V2-ndk", + "android.hardware.power-V3-ndk", ], srcs: [ "main.cpp", diff --git a/power/aidl/default/main.cpp b/power/aidl/default/main.cpp index 964bd96506..306b91b04f 100644 --- a/power/aidl/default/main.cpp +++ b/power/aidl/default/main.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + Power::descriptor + "/default"; binder_status_t status = AServiceManager_addService(vib->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/power/aidl/default/power-default.xml b/power/aidl/default/power-default.xml index 9f56debdae..927ba22dbf 100644 --- a/power/aidl/default/power-default.xml +++ b/power/aidl/default/power-default.xml @@ -1,7 +1,7 @@ <manifest version="1.0" type="device"> <hal format="aidl"> <name>android.hardware.power</name> - <version>2</version> + <version>3</version> <fqname>IPower/default</fqname> </hal> </manifest> diff --git a/power/stats/aidl/default/main.cpp b/power/stats/aidl/default/main.cpp index 2fe3d2e103..9e78247562 100644 --- a/power/stats/aidl/default/main.cpp +++ b/power/stats/aidl/default/main.cpp @@ -73,7 +73,7 @@ int main() { const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach |