Merge changes I7d394c66,I737d66e8
* changes:
crash_dump: improve logging for when a process dies prematurely.
debuggerd_handler: restore errno.
diff --git a/.clang-format b/.clang-format
new file mode 120000
index 0000000..9b45e0a
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+.clang-format-4
\ No newline at end of file
diff --git a/.clang-format-2 b/.clang-format-2
new file mode 100644
index 0000000..fb967d8
--- /dev/null
+++ b/.clang-format-2
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+
+AccessModifierOffset: -1
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 2
+PointerAlignment: Left
+TabWidth: 2
+UseTab: Never
+PenaltyExcessCharacter: 32
diff --git a/.clang-format b/.clang-format-4
similarity index 100%
rename from .clang-format
rename to .clang-format-4
diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 3135aa4..9589d88 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -571,7 +571,8 @@
remove_socket(s);
auto pred = [s](const auto& tracker) { return tracker.get() == s; };
- std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);
+ _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),
+ _jdwp_trackers.end());
}
static void jdwp_tracker_ready(asocket* s) {
diff --git a/init/Android.mk b/init/Android.mk
index 5bcfb7b..1a47eb4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -120,7 +120,9 @@
nonplat_sepolicy.cil \
plat_sepolicy.cil \
plat_sepolicy.cil.sha256 \
- secilc
+ secilc \
+ nonplat_file_contexts \
+ plat_file_contexts
# Include precompiled policy, unless told otherwise
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
@@ -129,7 +131,8 @@
else
# Use monolithic SELinux policy
-LOCAL_REQUIRED_MODULES += sepolicy
+LOCAL_REQUIRED_MODULES += sepolicy \
+ file_contexts.bin
endif
# Create symlinks.
diff --git a/libbacktrace/.clang-format b/libbacktrace/.clang-format
new file mode 120000
index 0000000..fd0645f
--- /dev/null
+++ b/libbacktrace/.clang-format
@@ -0,0 +1 @@
+../.clang-format-2
\ No newline at end of file
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 03f878a..86fec6a 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -53,7 +53,7 @@
# Pretty comprehensive set of native services. This list is helpful if all that's to be checked is an
# app.
-ifeq ($(SANITIZE_LITE),true)
+ifeq ($(SANITIZE_LITE_SERVICES),true)
SANITIZE_ASAN_OPTIONS_FOR := \
adbd \
ATFWD-daemon \
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 4a91189..25cea7f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -244,6 +244,10 @@
# set RLIMIT_NICE to allow priorities from 19 to -20
setrlimit 13 40 40
+ # This allows the ledtrig-transient properties to be created here so
+ # that they can be chown'd to system:system later on boot
+ write /sys/class/leds/vibrator/trigger "transient"
+
# Healthd can trigger a full boot from charger mode by signaling this
# property when the power button is held.
on property:sys.boot_from_charger_mode=1
@@ -563,6 +567,11 @@
chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+ chown system system /sys/class/leds/vibrator/trigger
+ chown system system /sys/class/leds/vibrator/activate
+ chown system system /sys/class/leds/vibrator/brightness
+ chown system system /sys/class/leds/vibrator/duration
+ chown system system /sys/class/leds/vibrator/state
chown system system /sys/class/timed_output/vibrator/enable
chown system system /sys/class/leds/keyboard-backlight/brightness
chown system system /sys/class/leds/lcd-backlight/brightness