diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libcutils/include/cutils/trace.h | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libcutils/include/cutils/trace.h')
| -rw-r--r-- | libcutils/include/cutils/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcutils/include/cutils/trace.h b/libcutils/include/cutils/trace.h index c74ee3e9d..793e2ce8a 100644 --- a/libcutils/include/cutils/trace.h +++ b/libcutils/include/cutils/trace.h @@ -75,7 +75,8 @@ __BEGIN_DECLS #define ATRACE_TAG_AIDL (1<<24) #define ATRACE_TAG_NNAPI (1<<25) #define ATRACE_TAG_RRO (1<<26) -#define ATRACE_TAG_LAST ATRACE_TAG_RRO +#define ATRACE_TAG_SYSPROP (1<<27) +#define ATRACE_TAG_LAST ATRACE_TAG_SYSPROP // Reserved for initialization. #define ATRACE_TAG_NOT_READY (1ULL<<63) |