commit | 9a4c8a207205f04eb431cc2c412a50a64567efe8 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Dec 01 17:15:36 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 01 17:15:39 2016 +0000 |
tree | 23ee451d99336852ee481605bf1a61f45a9eebb7 | |
parent | f81df2d5e52e50fe7197135baf5cabcabdba4628 [diff] | |
parent | e1cc01087a63210182f0d94f1cb3e8da833a1107 [diff] |
Merge "Revert "LightService: don't use implicit cast of Return<*>""
diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp index 50d51a5..a3ab8f6 100644 --- a/services/core/jni/com_android_server_lights_LightsService.cpp +++ b/services/core/jni/com_android_server_lights_LightsService.cpp
@@ -123,7 +123,7 @@ return; } - status = ret.get(); // hal status + status = static_cast<Status>(ret); // hal status } switch (status) {