p3100 bring up (squashed commits)

SELinux: Remove redundant entry in device.te
https://github.com/codyf86/android_device_samsung_p3100/commit/83511bd8d41ead6d2b3156fba676838145889efe

SELinux: Fix redundant entry in file_contexts
https://github.com/codyf86/android_device_samsung_p3100/commit/1760227b238957c59081787815ea369741e09027

Update Wifi / fstab props; Start FUSE daemon (storage)
https://github.com/codyf86/android_device_samsung_p3100/commit/9def5325332be7b6c060c8c68e80e285736eda4c

Update permissions in init.espresso.rc
https://github.com/codyf86/android_device_samsung_p3100/commit/08f6ebf74c80f767ec0017da4194df27a6b6c64d

Cleanup common makefile
https://github.com/codyf86/android_device_samsung_p3100/commit/4e2be9fbc05ab22d5cfcc61df6be70a282369488

SELinux: Fix typo in file_contexts
https://github.com/codyf86/android_device_samsung_p3100/commit/61c55bb29d55b0015fdfdf6e4ccad90a9000b985

CommonMK: Update drawable settings
https://github.com/codyf86/android_device_samsung_p3100/commit/f03cc10d4941e7289d112c6e6d0b1eaf4d1f6d9b

Change-Id: I4e88d1d217d892f3ba6dba6dc5e4032301699bee

5 files changed, 37 insertions, 27 deletions

diff --git a/p31xx-common.mk b/p31xx-common.mk
index e70bd09..f66cdd6 100755
--- a/p31xx-common.mk
+++ b/p31xx-common.mk
@@ -27,9 +27,8 @@ $(call inherit-product, device/common/gps/gps_us_supl.mk)
 LOCAL_PATH := device/samsung/p3100
 
 # Enable higher-res drawables while keeping mdpi as primary source
-PRODUCT_AAPT_CONFIG := large mdpi hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG := mdpi
-PRODUCT_LOCALES += mdpi
+PRODUCT_AAPT_CONFIG := normal large tvdpi hdpi
+PRODUCT_AAPT_PREF_CONFIG := tvdpi
 
 # Init files
 PRODUCT_COPY_FILES += \
@@ -38,13 +37,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/ueventd.espresso.rc:root/ueventd.espresso.rc \
     $(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso
 
-# Audio
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/audio_effects.conf:system/etc/audio_effects.conf
-
 # GPS
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \
     $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml
 
 # Wifi
@@ -99,8 +93,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
-    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
+    frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
 
 PRODUCT_CHARACTERISTICS := tablet
 
diff --git a/rootdir/fstab.espresso b/rootdir/fstab.espresso
index b2e4217..54979b6 100644
--- a/rootdir/fstab.espresso
+++ b/rootdir/fstab.espresso
@@ -9,8 +9,8 @@
 /dev/block/platform/omap/omap_hsmmc.1/by-name/CACHE             /cache              ext4        noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit      wait,check
 
 # vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1               /storage/sdcard1    auto        defaults        voldmanaged=sdcard1:auto
-/devices/platform/omap/musb-omap2430/musb-hdrc/usb1             /storage/usbdisk0   auto        defaults        voldmanaged=usbdisk0:auto
+/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1               auto    auto    defaults    voldmanaged=sdcard1:auto
+/devices/platform/omap/musb-omap2430/musb-hdrc/usb1             auto    auto    defaults    voldmanaged=usbdisk0:auto
 
 # recovery
 /dev/block/mmcblk0p5                                            /boot               emmc        defaults        recoveryonly
diff --git a/rootdir/init.espresso.rc b/rootdir/init.espresso.rc
index d7680b5..6925764 100755
--- a/rootdir/init.espresso.rc
+++ b/rootdir/init.espresso.rc
@@ -2,10 +2,12 @@ import init.espresso.usb.rc
 
 on init
     mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage 0550 system sdcard_r
+    mkdir /storage 0751 root sdcard_r
     mkdir /storage/emulated 0555 root root
-    mkdir /storage/sdcard1 0775 system system
-    mkdir /storage/usbdisk0 0775 system system
+    mkdir /storage/sdcard1 0700 root root
+    mkdir /storage/usbdisk0 0700 root root
+    mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
+    mkdir /mnt/media_rw/usbdisk0 0700 media_rw media_rw
 
     export EXTERNAL_STORAGE /storage/emulated/legacy
     export SECONDARY_STORAGE /storage/sdcard1
@@ -42,6 +44,7 @@ on fs
     mkdir /efs
     mount_all /fstab.espresso
 
+ # We chown/chmod /efs because mount is run as root + defaults
     chown radio system /efs
     chmod 0775 /efs
 
@@ -313,13 +316,27 @@ service geomagneticd /system/bin/geomagneticd
 # create virtual SD card at /storage/sdcard0, based on the /data/media directory
 # daemon will drop to user/group system/media_rw after initializing
 # underlying files in /data/media will be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
     class late_start
+    oneshot
+
+# FUSE sdcard daemon for rich permissions (runs as media_rw)
+service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
+    class late_start
+    disabled
+
+service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk0 /storage/usbdisk0
+    class late_start
+    disabled
 
 service p2p_supplicant /system/bin/wpa_supplicant \
-        -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
-        -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \
-        -puse_p2p_group_interface=1
+    -iwlan0 -Dnl80211 -iwlan0 -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/p2p_supplicant_overlay.conf \
+    -puse_p2p_group_interface=1 -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
     #   user wifi
@@ -330,8 +347,10 @@ service p2p_supplicant /system/bin/wpa_supplicant \
     oneshot
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-        -Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \
-        -c/data/misc/wifi/wpa_supplicant.conf
+    -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
     #   user wifi
@@ -389,9 +408,9 @@ service gpsd /system/bin/gpsd -c /system/etc/gps.xml
 
 # Keyboard
 service dock_kbd_attach /system/bin/dock_kbd_attach /dev/ttyO3
-	class main
-	user root
-	oneshot
+        class main
+        user root
+        oneshot
 
 # LPM
 on property:ro.bootmode=charger
diff --git a/selinux/device.te b/selinux/device.te
index 5d39a97..7c28653 100644
--- a/selinux/device.te
+++ b/selinux/device.te
@@ -1,3 +1,2 @@
 type efs_block_device, dev_type;
-type powervr_device, dev_type, mlstrustedobject;
 type rfkill_device, dev_type;
diff --git a/selinux/file_contexts b/selinux/file_contexts
index 2c0d875..c928bb0 100644
--- a/selinux/file_contexts
+++ b/selinux/file_contexts
@@ -1,6 +1,5 @@
 # GFX
 /dev/dsscomp                                u:object_r:video_device:s0
-/dev/pvrsrvkm                               u:object_r:powervr_device:s0
 
 # RIL
 /dev/umts_boot0                             u:object_r:radio_device:s0
@@ -24,7 +23,7 @@
 
 # System binaries
 /system/vendor/bin/pvrsrvinit               u:object_r:pvrsrvinit_exec:s0
-/system/vendor/bin/pvrsrvinit_SGX540_120    u:object_r:pvrsrvinit_exec:s0
+/system/vendor/bin/pvrsrvctl_SGX540_120     u:object_r:pvrsrvinit_exec:s0
 
 # Firmwares
 /system/vendor/firmware/ducati-m3.bin       u:object_r:firmware_ducati:s0