summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/cutils/trace.h17
-rw-r--r--include/system/graphics.h2
-rw-r--r--include/system/window.h5
-rw-r--r--rootdir/init.rc3
4 files changed, 26 insertions, 1 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index a0dd1e034..1c8f10728 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -259,6 +259,23 @@ static inline void atrace_int(uint64_t tag, const char* name, int32_t value)
259 } 259 }
260} 260}
261 261
262/**
263 * Traces a 64-bit integer counter value. name is used to identify the
264 * counter. This can be used to track how a value changes over time.
265 */
266#define ATRACE_INT64(name, value) atrace_int64(ATRACE_TAG, name, value)
267static inline void atrace_int64(uint64_t tag, const char* name, int64_t value)
268{
269 if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {
270 char buf[ATRACE_MESSAGE_LENGTH];
271 size_t len;
272
273 len = snprintf(buf, ATRACE_MESSAGE_LENGTH, "C|%d|%s|%lld",
274 getpid(), name, value);
275 write(atrace_marker_fd, buf, len);
276 }
277}
278
262#else // not HAVE_ANDROID_OS 279#else // not HAVE_ANDROID_OS
263 280
264#define ATRACE_INIT() 281#define ATRACE_INIT()
diff --git a/include/system/graphics.h b/include/system/graphics.h
index 154f9cb4c..be86ae42b 100644
--- a/include/system/graphics.h
+++ b/include/system/graphics.h
@@ -293,6 +293,8 @@ enum {
293 HAL_TRANSFORM_ROT_180 = 0x03, 293 HAL_TRANSFORM_ROT_180 = 0x03,
294 /* rotate source image 270 degrees clockwise */ 294 /* rotate source image 270 degrees clockwise */
295 HAL_TRANSFORM_ROT_270 = 0x07, 295 HAL_TRANSFORM_ROT_270 = 0x07,
296 /* don't use. see system/window.h */
297 HAL_TRANSFORM_RESERVED = 0x08,
296}; 298};
297 299
298#ifdef __cplusplus 300#ifdef __cplusplus
diff --git a/include/system/window.h b/include/system/window.h
index 7ce59e02f..649bd71fd 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -296,12 +296,15 @@ enum {
296 NATIVE_WINDOW_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H , 296 NATIVE_WINDOW_TRANSFORM_FLIP_H = HAL_TRANSFORM_FLIP_H ,
297 /* flip source image vertically */ 297 /* flip source image vertically */
298 NATIVE_WINDOW_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_V, 298 NATIVE_WINDOW_TRANSFORM_FLIP_V = HAL_TRANSFORM_FLIP_V,
299 /* rotate source image 90 degrees clock-wise */ 299 /* rotate source image 90 degrees clock-wise, and is applied after TRANSFORM_FLIP_{H|V} */
300 NATIVE_WINDOW_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90, 300 NATIVE_WINDOW_TRANSFORM_ROT_90 = HAL_TRANSFORM_ROT_90,
301 /* rotate source image 180 degrees */ 301 /* rotate source image 180 degrees */
302 NATIVE_WINDOW_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180, 302 NATIVE_WINDOW_TRANSFORM_ROT_180 = HAL_TRANSFORM_ROT_180,
303 /* rotate source image 270 degrees clock-wise */ 303 /* rotate source image 270 degrees clock-wise */
304 NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270, 304 NATIVE_WINDOW_TRANSFORM_ROT_270 = HAL_TRANSFORM_ROT_270,
305 /* transforms source by the inverse transform of the screen it is displayed onto. This
306 * transform is applied last */
307 NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY = 0x08
305}; 308};
306 309
307/* parameter for NATIVE_WINDOW_SET_SCALING_MODE */ 310/* parameter for NATIVE_WINDOW_SET_SCALING_MODE */
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 19ab6cc7e..be74f6fc2 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -177,6 +177,9 @@ on post-fs-data
177 # We restorecon /data in case the userdata partition has been reset. 177 # We restorecon /data in case the userdata partition has been reset.
178 restorecon /data 178 restorecon /data
179 179
180 # Avoid predictable entropy pool. Carry over entropy from previous boot.
181 copy /data/system/entropy.dat /dev/urandom
182
180 # Create dump dir and collect dumps. 183 # Create dump dir and collect dumps.
181 # Do this before we mount cache so eventually we can use cache for 184 # Do this before we mount cache so eventually we can use cache for
182 # storing dumps on platforms which do not have a dedicated dump partition. 185 # storing dumps on platforms which do not have a dedicated dump partition.