commit c8e3a27b43407268b2bb76b1d4fceee4fa3b314a
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:19:18 2012 -0800
committer The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:19:18 2012 -0800
tree c6374c0df22e7c8b0f312db0aee37b130740f557
parent 9f239afc3565770f39ae94c2969addb520af3a40
parent b151510bee9d81f164b13a4a2b460465285ea836
parent 74365b18c1146a77ecd0938106fd53f38a7e5eda

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I89230f756ce6caee4d7fa4514f47b6b0fc44d1f3

include/system/audio_policy.h

diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 6b49a80..a6554de 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -43,7 +43,6 @@
     AUDIO_POLICY_FORCE_ANALOG_DOCK,
     AUDIO_POLICY_FORCE_DIGITAL_DOCK,
     AUDIO_POLICY_FORCE_NO_BT_A2DP, /* A2DP sink is not preferred to speaker or wired HS */
-    AUDIO_POLICY_FORCE_REMOTE_SUBMIX,
     AUDIO_POLICY_FORCE_SYSTEM_ENFORCED,
 
     AUDIO_POLICY_FORCE_CFG_CNT,

rootdir/init.trace.rc

diff --git a/rootdir/init.trace.rc b/rootdir/init.trace.rc
index 1d114f5..8a05fd0 100644
--- a/rootdir/init.trace.rc
+++ b/rootdir/init.trace.rc
@@ -13,6 +13,7 @@
     chown root shell /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
     chown root shell /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
     chown root shell /sys/kernel/debug/tracing/events/power/cpu_idle/enable
+    chown root shell /sys/kernel/debug/tracing/events/power/clock_set_rate/enable
     chown root shell /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
     chown root shell /sys/kernel/debug/tracing/tracing_on
 
@@ -23,6 +24,7 @@
     chmod 0664 /sys/kernel/debug/tracing/events/sched/sched_wakeup/enable
     chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
     chmod 0664 /sys/kernel/debug/tracing/events/power/cpu_idle/enable
+    chmod 0664 /sys/kernel/debug/tracing/events/power/clock_set_rate/enable
     chmod 0664 /sys/kernel/debug/tracing/events/cpufreq_interactive/enable
     chmod 0664 /sys/kernel/debug/tracing/tracing_on
 

rootdir/ueventd.rc

diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 72c4078..2cf0265 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -28,7 +28,7 @@
 /dev/android_adb_enable   0660   adb        adb
 /dev/ttyMSM0              0600   bluetooth  bluetooth
 /dev/uhid                 0660   system     net_bt_stack
-/dev/uinput               0660   system     bluetooth
+/dev/uinput               0660   system     net_bt_stack
 /dev/alarm                0664   system     radio
 /dev/tty0                 0660   root       system
 /dev/graphics/*           0660   root       graphics