| commit | 42c78cb65dbe315c50236fe1a11dfaf40fef2534 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Fri Jun 08 07:24:38 2018 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Jun 08 07:24:38 2018 +0000 |
| tree | 68ac157bfd2c4ac4b2efec82bd4b95d2759aa6ba | |
| parent | fed9c5bacda4bc2b34468e0e72469fbbfb7dae97 [diff] | |
| parent | ba88c2e9bcfb8665ef8fe55eab3b3d0895d0592c [diff] |
Snap for 4829593 from ba88c2e9bcfb8665ef8fe55eab3b3d0895d0592c to pi-release Change-Id: I6a5657813f61abf9f34bcd67e699b60c50e35769
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png index a02fd89..f739fa2 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png index c309ac5..4b45e3a 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png index 414fad4..748d1a2 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png index c147a87..6e436ba 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png Binary files differ
diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png index 4ce2125..9776874 100644 --- a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png +++ b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png Binary files differ
diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index c5c3fd5..d6d0340 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp
@@ -72,7 +72,7 @@ // ------------ 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 6ca7592..171be77 100644 --- a/libs/binder/include/private/binder/Static.h +++ b/libs/binder/include/private/binder/Static.h
@@ -32,7 +32,7 @@ extern Vector<int32_t> gTextBuffers; // For ProcessState.cpp -extern Mutex gProcessMutex; +extern Mutex& gProcessMutex; extern sp<ProcessState> gProcess; // For IServiceManager.cpp
