summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-08-16 03:14:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-16 03:14:32 +0000
commit84a248ce27bc4e4155ee2f86f8a7038cab8d3b0b (patch)
tree0ab0336fd44c0deebc42af723eab6377d07a0a46
parent585fc42de76e35eab38b1489ac5f71043db05f01 (diff)
parent69d68b69e5341124c1947f3110c67aa8836e3437 (diff)
downloadsystem_core-84a248ce27bc4e4155ee2f86f8a7038cab8d3b0b.zip
system_core-84a248ce27bc4e4155ee2f86f8a7038cab8d3b0b.tar.gz
system_core-84a248ce27bc4e4155ee2f86f8a7038cab8d3b0b.tar.bz2
am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
* commit '69d68b69e5341124c1947f3110c67aa8836e3437': Add trace tag for power management.
-rw-r--r--include/cutils/trace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index fd9bc6a..fd24561 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -70,7 +70,8 @@ __BEGIN_DECLS
#define ATRACE_TAG_DALVIK (1<<14)
#define ATRACE_TAG_RS (1<<15)
#define ATRACE_TAG_BIONIC (1<<16)
-#define ATRACE_TAG_LAST ATRACE_TAG_BIONIC
+#define ATRACE_TAG_POWER (1<<17)
+#define ATRACE_TAG_LAST ATRACE_TAG_POWER
// Reserved for initialization.
#define ATRACE_TAG_NOT_READY (1LL<<63)