merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f0a52d8..a3d210a 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -106,14 +106,14 @@
{ REQ, "/sys/kernel/debug/tracing/events/power/cpu_idle/enable" },
} },
{ "disk", "Disk I/O", 0, {
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_issue/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_complete/enable" },
} },
diff --git a/data/etc/android.hardware.camera.burst_capture.xml b/data/etc/android.hardware.camera.burst_capture.xml
new file mode 100644
index 0000000..812754f
--- /dev/null
+++ b/data/etc/android.hardware.camera.burst_capture.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the set of features required for a camera2 device that supports the
+ burst capture capability-->
+<permissions>
+ <feature name="android.hardware.camera.any" />
+ <feature name="android.hardware.camera.capability.burst_capture" />
+</permissions>
diff --git a/data/etc/android.hardware.camera.full.xml b/data/etc/android.hardware.camera.full.xml
index a05dcbe..df0085e 100644
--- a/data/etc/android.hardware.camera.full.xml
+++ b/data/etc/android.hardware.camera.full.xml
@@ -20,4 +20,6 @@
<feature name="android.hardware.camera.level.full" />
<feature name="android.hardware.camera.capability.manual_sensor" />
<feature name="android.hardware.camera.capability.manual_post_processing" />
+ <feature name="android.hardware.camera.capability.burst_capture" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
</permissions>
diff --git a/data/etc/android.hardware.camera.manual_sensor.xml b/data/etc/android.hardware.camera.manual_sensor.xml
index 57db5ab..7795067 100644
--- a/data/etc/android.hardware.camera.manual_sensor.xml
+++ b/data/etc/android.hardware.camera.manual_sensor.xml
@@ -18,4 +18,5 @@
<permissions>
<feature name="android.hardware.camera.any" />
<feature name="android.hardware.camera.capability.manual_sensor" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
</permissions>
diff --git a/data/etc/android.hardware.camera.read_sensor_settings.xml b/data/etc/android.hardware.camera.read_sensor_settings.xml
new file mode 100644
index 0000000..d5018f3
--- /dev/null
+++ b/data/etc/android.hardware.camera.read_sensor_settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This is the set of features required for a camera2 device that supports the
+ read sensor settings capability-->
+<permissions>
+ <feature name="android.hardware.camera.any" />
+ <feature name="android.hardware.camera.capability.read_sensor_settings" />
+</permissions>