Merge "libui: add support for android.hardware.graphics"
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index f3b12b1..d486a3d 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -1,6 +1,6 @@
## Permissions to allow system-wide tracing to the kernel trace buffer.
##
-on boot
+on fs
# Allow writing to the kernel trace log.
chmod 0222 /sys/kernel/debug/tracing/trace_marker
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 71b5cca..8371e9b 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
-LOCAL_CPPFLAGS := -std=c++1y -Weverything -Werror
+LOCAL_CPPFLAGS := -Weverything -Werror
# The static constructors and destructors in this library have not been noted to
# introduce significant overheads
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 1dc40b3..37b2873 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -17,7 +17,6 @@
clang: true,
cppflags: [
- "-std=c++1y",
"-Weverything",
"-Werror",
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 3253056..f5a4114 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -142,7 +142,12 @@
libgui \
libpowermanager \
libvulkan \
- libprotobuf-cpp-full
+ libprotobuf-cpp-full \
+ libhidl \
+ libhwbinder \
+ libbase \
+ libutils \
+ android.hardware.power@1.0
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
diff --git a/services/surfaceflinger/DisplayHardware/PowerHAL.cpp b/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
index bd50b4a..1c0a1fe 100644
--- a/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
+++ b/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <android/hardware/power/1.0/IPower.h>
#include <stdint.h>
#include <sys/types.h>
@@ -26,6 +27,7 @@
#include "PowerHAL.h"
+using android::hardware::power::V1_0::PowerHint;
namespace android {
// ---------------------------------------------------------------------------
@@ -39,7 +41,9 @@
}
mPowerManager = interface_cast<IPowerManager>(bs);
}
- status_t status = mPowerManager->powerHint(POWER_HINT_VSYNC, enabled ? 1 : 0);
+ status_t status;
+ status = mPowerManager->powerHint(static_cast<int>(PowerHint::VSYNC),
+ enabled ? 1 : 0);
if(status == DEAD_OBJECT) {
mPowerManager = NULL;
}