diff options
| author | mcampbellsmith <mcampbellsmith@gmail.com> | 2013-11-11 22:02:10 +1100 |
|---|---|---|
| committer | mcampbellsmith <mcampbellsmith@gmail.com> | 2013-11-13 00:00:00 +1100 |
| commit | 13661807214acd0639ca47b06e30a95f334480a3 (patch) | |
| tree | b0c7fcb0ed598bd28e8e00530eea0d76c831d94c | |
| parent | 6a96daf8de4eda23ebea076f50b0744cb48c4909 (diff) | |
| download | device_samsung_i9305-13661807214acd0639ca47b06e30a95f334480a3.zip device_samsung_i9305-13661807214acd0639ca47b06e30a95f334480a3.tar.gz device_samsung_i9305-13661807214acd0639ca47b06e30a95f334480a3.tar.bz2 | |
i9305: update to 4.4
Change-Id: I7f87a251ded44894b5ca51089b148267d0833caf
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | rootdir/fstab.smdk4x12 | 4 | ||||
| -rw-r--r-- | selinux/file_contexts | 3 | ||||
| -rwxr-xr-x | selinux/system.te | 5 |
5 files changed, 9 insertions, 11 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8dd1e25..fe15653 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -46,10 +46,10 @@ TARGET_OTA_ASSERT_DEVICE := m3,m3xx,i9305,GT-I9305 -include vendor/samsung/i9305/BoardConfigVendor.mk # Selinux -BOARD_SEPOLICY_DIRS := \ +BOARD_SEPOLICY_DIRS += \ device/samsung/i9305/selinux -BOARD_SEPOLICY_UNION := \ +BOARD_SEPOLICY_UNION += \ file_contexts \ te_macros \ device.te \ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index cbff611..84a4b61 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -95,10 +95,10 @@ <bool name="config_disableMenuKeyInLockScreen">true</bool> <!-- Disable the home key unlock setting --> - <bool name="config_disableHomeUnlockSetting">false</bool> + <!-- <bool name="config_disableHomeUnlockSetting">false</bool> --> <!-- Workaround for devices with broken keyboards --> - <bool name="config_forceDisableHardwareKeyboard">true</bool> + <!-- <bool name="config_forceDisableHardwareKeyboard">true</bool> --> <!-- Hardware 'face' keys present on the device, stored as a bit field. This integer should equal the sum of the corresponding value for each diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12 index 69749bd..e54474f 100644 --- a/rootdir/fstab.smdk4x12 +++ b/rootdir/fstab.smdk4x12 @@ -12,8 +12,8 @@ /dev/block/mmcblk0p16 /data ext4 noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer # vold-managed volumes ("block device" is actually a sysfs devpath) -/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto -/devices/platform/s5p-ehci /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto +/devices/platform/s3c-sdhci.2/mmc_host/mmc1 auto auto defaults voldmanaged=sdcard1:auto +/devices/platform/s5p-ehci auto auto defaults voldmanaged=usbdisk0:auto # recovery /dev/block/mmcblk0p8 /boot emmc defaults recoveryonly diff --git a/selinux/file_contexts b/selinux/file_contexts index 856bdd5..fb1996e 100644 --- a/selinux/file_contexts +++ b/selinux/file_contexts @@ -3,9 +3,6 @@ /dev/ump u:object_r:mali_device:s0 /dev/fimg2d u:object_r:mali_device:s0 -# NFC -/dev/pn544 u:object_r:nfc_device:s0 - # RIL /dev/mdm u:object_r:radio_device:s0 /dev/hsicctl[0-3]* u:object_r:radio_device:s0 diff --git a/selinux/system.te b/selinux/system.te index 73de1ee..bfc12a6 100755 --- a/selinux/system.te +++ b/selinux/system.te @@ -2,11 +2,12 @@ qmux_socket(system) allow system diagnostic_device:chr_file rw_file_perms; -allow system uinput_device:chr_file { read ioctl write open }; +#allow system uinput_device:chr_file { read ioctl write open }; allow system sensors_device:chr_file { read open }; allow system sensors_data_file:file r_file_perms; allow system wpa_socket:unix_dgram_socket sendto; allow system_app volume_data_file:file { read write open getattr }; allow system sysfs:file { read open write }; -allow system self:capability { sys_module };
\ No newline at end of file +allow system self:capability { sys_module }; + |