Merge "Adding opus to media_codecs.xml"
diff --git a/audio/Android.mk b/audio/Android.mk
index 33969c3..96341d2 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := audio.primary.manta
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
audio_hw.c
LOCAL_C_INCLUDES += \
@@ -32,4 +32,3 @@
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
-
diff --git a/init.manta.rc b/init.manta.rc
index 2f1f237..7eecd29 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -24,13 +24,8 @@
on post-fs-data
mkdir /data/media 0770 media_rw media_rw
- restorecon_recursive /data/media
setprop vold.post_fs_data_done 1
- mkdir /data/misc/wifi 0770 wifi wifi
- mkdir /data/misc/wifi/sockets 0770 wifi wifi
- mkdir /data/misc/dhcp 0770 dhcp dhcp
- chown dhcp dhcp /data/misc/dhcp
# permissions for bluetooth.
setprop ro.bt.bdaddr_path "/factory/bluetooth/bt_addr"
@@ -82,7 +77,6 @@
# NFC: create data/nfc for nv storage
mkdir /data/nfc 770 nfc nfc
mkdir /data/nfc/param 770 nfc nfc
- restorecon_recursive /data/nfc
# audio: permissions for voice processing
# global switch for voice processing effects
@@ -110,10 +104,8 @@
service p2p_supplicant /system/bin/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -O/data/misc/wifi/sockets \
- -N -ip2p0 -Dnl80211 \
- -c/data/misc/wifi/p2p_supplicant.conf \
+ -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \
+ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
-I/system/etc/wifi/p2p_supplicant_overlay.conf \
-puse_p2p_group_interface=1 \
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
@@ -129,7 +121,6 @@
service wpa_supplicant /system/bin/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -O/data/misc/wifi/sockets \
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
diff --git a/kernel b/kernel
index 25ad44b..23e1852 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/liblights/Android.mk b/liblights/Android.mk
index 96b5856..0f2afce 100644
--- a/liblights/Android.mk
+++ b/liblights/Android.mk
@@ -19,7 +19,7 @@
LOCAL_SRC_FILES := lights.c
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 51fa7f6..0b20eba 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -166,6 +166,8 @@
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers">8</integer>
+ <!-- Whether UI for multi user should be shown -->
+ <bool name="config_enableMultiUserUI">true</bool>
<bool name="config_ui_enableFadingMarquee">false</bool>
diff --git a/power/Android.mk b/power/Android.mk
index 098c4b9..c0808ec 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -19,7 +19,7 @@
# hw/<POWERS_HARDWARE_MODULE_ID>.<ro.hardware>.so
include $(CLEAR_VARS)
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := power_manta.c
LOCAL_MODULE := power.manta
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index fe7116d..6f74922 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -18,6 +18,8 @@
/dev/video18 u:object_r:video_device:s0
/dev/video19 u:object_r:video_device:s0
+/dev/fimg2d u:object_r:video_device:s0
+
/dev/video40 u:object_r:camera_device:s0
/dev/video41 u:object_r:camera_device:s0
/dev/video42 u:object_r:camera_device:s0
@@ -25,7 +27,9 @@
/dev/video44 u:object_r:camera_device:s0
/dev/media2 u:object_r:camera_device:s0
-/data/nfc(/.*)? u:object_r:nfc_data_file:s0
+/data/app/tlcd_sock u:object_r:drmserver_socket:s0
+
+/data/nfc(/.*)? u:object_r:nfc_data_file:s0
/factory(/.*)? u:object_r:efs_file:s0
/factory/bluetooth(/.*)? u:object_r:bluetooth_efs_file:s0
