diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-10 03:05:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-10 03:05:50 +0000 |
| commit | cfa2c51d0673c17dae6ba5b4537a49f53a2b421c (patch) | |
| tree | 68ac157bfd2c4ac4b2efec82bd4b95d2759aa6ba | |
| parent | f390d78ab77f7d4c75639d619e0eae1a2a5305c9 (diff) | |
| parent | ba88c2e9bcfb8665ef8fe55eab3b3d0895d0592c (diff) | |
| download | native-cfa2c51d0673c17dae6ba5b4537a49f53a2b421c.tar.gz | |
Snap for 4832091 from ba88c2e9bcfb8665ef8fe55eab3b3d0895d0592c to pi-dr1-release
Change-Id: I04ab55a479af30ed377f709a731cea213ebe1a04
| -rw-r--r-- | docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png | bin | 31494 -> 21736 bytes | |||
| -rw-r--r-- | docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png | bin | 22690 -> 15510 bytes | |||
| -rw-r--r-- | docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png | bin | 21822 -> 15016 bytes | |||
| -rw-r--r-- | docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png | bin | 32384 -> 22992 bytes | |||
| -rw-r--r-- | docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png | bin | 32315 -> 22087 bytes | |||
| -rw-r--r-- | libs/binder/Static.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/include/private/binder/Static.h | 2 |
7 files changed, 2 insertions, 2 deletions
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png Binary files differindex a02fd893b2..f739fa2bc2 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png Binary files differindex c309ac5ea8..4b45e3aa9c 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png Binary files differindex 414fad49a9..748d1a2962 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png Binary files differindex c147a8729f..6e436baa3b 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png Binary files differindex 4ce2125f3c..9776874bb0 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index c5c3fd58c3..d6d0340a36 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -72,7 +72,7 @@ TextOutput& aerr(gStderrTextOutput); // ------------ ProcessState.cpp -Mutex gProcessMutex; +Mutex& gProcessMutex = *new Mutex; sp<ProcessState> gProcess; class LibBinderIPCtStatics diff --git a/libs/binder/include/private/binder/Static.h b/libs/binder/include/private/binder/Static.h index 6ca75926a4..171be7791e 100644 --- a/libs/binder/include/private/binder/Static.h +++ b/libs/binder/include/private/binder/Static.h @@ -32,7 +32,7 @@ namespace android { extern Vector<int32_t> gTextBuffers; // For ProcessState.cpp -extern Mutex gProcessMutex; +extern Mutex& gProcessMutex; extern sp<ProcessState> gProcess; // For IServiceManager.cpp |
