msm8953-common: Decommonize nfc permissions

Signed-off-by: Jorge Lucas <jorgelucas@pixelexperience.org>

BoardConfigCommon.mk

@@ -155,6 +155,7 @@ TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8953
 # Kernel
 TARGET_COMPILE_WITH_MSM_KERNEL := true
 BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci loop.max_part=16
+BOARD_KERNEL_CMDLINE += sched_enable_hmp=1 sched_enable_power_aware=1 app_setting.use_32bit_app_setting=1 kpti=1
 BOARD_KERNEL_BASE := 0x80000000
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
@@ -188,7 +189,6 @@ VENDOR_SECURITY_PATCH := 2020-10-01
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 BOARD_VNDK_VERSION := current
-BOARD_VNDK_RUNTIME_DISABLE := true
 
 # Peripheral manager
 TARGET_PER_MGR_ENABLED := true

extract-files.sh

@@ -89,6 +89,10 @@ function blob_fixup() {
         patchelf --add-needed libqsap_shim.so "${2}"
         ;;
 
+    vendor/lib/libmot_gpu_mapper.so)
+        sed -i "s/libgui/libwui/" "${2}"
+        ;;
+
     esac
 }
 
@@ -107,4 +111,4 @@ if [[ "$ONLY_COMMON" = "false" ]] && [[ -s "${DEVICE_DIR}"/proprietary-files.txt
     extract "${DEVICE_DIR}"/proprietary-files.txt "$SRC" "${KANG}" --section "${SECTION}"
 fi
 
-"$COMMON_DIR"/setup-makefiles.sh
+"$COMMON_DIR"/setup-makefiles.sh

libshims/Android.mk

@@ -23,3 +23,11 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libgui_vendor
+LOCAL_MODULE := libwui
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_SHARED_LIBRARY)

manifest.xml

@@ -642,4 +642,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>motorola.hardware.tv</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDTVHW</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>

msm8953.mk

@@ -80,7 +80,7 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
     camera.device@1.0-impl \
     camera.device@3.2-impl \
-    libgui_vendor \
+    libwui \
     vendor.qti.hardware.camera.device@1.0 \
     vendor.qti.hardware.camera.device@1.0_vendor \
     MotCamera2
@@ -204,6 +204,7 @@ PRODUCT_PACKAGES += \
     init.mmi.usb.rc \
     init.mmi.rc \
     init.qcom.rc \
+    init.recovery.qcom.rc \
     init.target.rc \
     ueventd.qcom.rc
 
@@ -302,9 +303,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
-    frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.xml \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_nfc/android.hardware.nfc.hcef.xml \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
     frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
     frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \

proprietary-files.txt

@@ -797,7 +797,7 @@ etc/init/wfdservice.rc|311bfdd1675e56499662f39455536b75b78477bb
 etc/wfdconfig.xml|d07f6b0441c0aa8913865100239490fa8687a020
 etc/wfdconfigsink.xml|5b4a96f251fd83c2eee520d06bea2b5b159fcd36
 -framework/WfdCommon.jar|3440607d29511e1a671e565a2acc4d262e38a9fb
-lib/com.qualcomm.qti.wifidisplayhal@1.0.so|ae4ba4448820bae832db16c4d64bd547bff13503
+lib/com.qualcomm.qti.wifidisplayhal@1.0.so:vendor/lib/com.qualcomm.qti.wifidisplayhal@1.0.so|ae4ba4448820bae832db16c4d64bd547bff13503
 lib64/libFileMux.so|8d07dde58a8b629ccce4dd9c778e76a6513ca555
 lib64/libmmparser_lite.so|bea6788f2f0924c74a3bb7c1fdd24bc59202550c
 lib64/libmmosal.so|9ceff2581e86d32bc2795dffb96ebe4bdc88f2f7

rootdir/Android.mk

@@ -129,3 +129,11 @@ LOCAL_SRC_FILES    := root/ueventd.qcom.rc
 # this needs to be in /vendor/ueventd.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.recovery.qcom.rc
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.recovery.qcom.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)

rootdir/etc/init.mmi.chipset.rc

@@ -16,6 +16,12 @@ on boot
     chown system oem_5004 /sys/devices/soc/soc:fpc_fpc1020/irq
     chown system oem_5004 /sys/devices/soc/soc:fpc_fpc1020/irq_cnt
     chmod 0440 /sys/devices/soc/soc:fpc_fpc1020/irq_cnt
+    chown system oem_5004 /sys/bus/spi/devices/spi8.0/nav
+    chown system oem_5004 /sys/bus/spi/devices/spi8.0/clk_enable
+    chown system oem_5004 /sys/bus/spi/devices/spi8.0/dev_enable
+    chown system oem_5004 /sys/bus/spi/devices/spi8.0/irq
+    chown system oem_5004 /sys/bus/spi/devices/spi8.0/irq_cnt
+    chmod 0440 /sys/bus/spi/devices/spi8.0/irq_cnt
 
 on post-fs-data
     #setup folder for WLAN WAPI

rootdir/etc/init.recovery.qcom.rc

@@ -0,0 +1,65 @@
+# Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of The Linux Foundation nor
+#       the names of its contributors may be used to endorse or promote
+#       products derived from this software without specific prior written
+#       permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+on init
+    write /sys/class/backlight/panel0-backlight/brightness 200
+
+    mkdir /config
+    mount configfs none /config
+    mkdir /config/usb_gadget/g1 0770 shell shell
+    write /config/usb_gadget/g1/bcdUSB 0x0200
+    write /config/usb_gadget/g1/idVendor 0x18d1
+    write /config/usb_gadget/g1/idProduct 0xd001
+    mkdir /config/usb_gadget/g1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
+    write /config/usb_gadget/g1/strings/0x409/manufacturer ${ro.product.manufacturer}
+    write /config/usb_gadget/g1/strings/0x409/product ${ro.product.model}
+    mkdir /config/usb_gadget/g1/functions/ffs.adb
+    write /config/usb_gadget/g1/os_desc/use 1
+    write /config/usb_gadget/g1/os_desc/b_vendor_code 0x1
+    write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
+
+on property:ro.boot.usbconfigfs=true
+    setprop sys.usb.configfs 1
+
+on property:ro.boot.usbconfigfs=false
+    setprop sys.usb.configfs 0
+
+on property:ro.boot.usbcontroller=*
+    setprop sys.usb.controller ${ro.boot.usbcontroller}
+
+on property:sys.usb.ffs.ready=1
+    mkdir /config/usb_gadget/g1/configs/b.1 0777 shell shell
+    symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
+    mkdir /config/usb_gadget/g1/configs/b.1/strings/0x409 0770 shell shell
+    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "adb"
+    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f1
+    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
+
+on fs
+    wait /dev/block/platform/soc/${ro.boot.bootdevice}
+    symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice

rootdir/root/ueventd.qcom.rc

@@ -303,6 +303,7 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/nfc-nci              0660    nfc         nfc
 /dev/nq-nci               0660    nfc         nfc
 /dev/assd                 0660    nfc         nfc
+/dev/pn544                0660    nfc         nfc
 
 # UIO devices
 /dev/uio0                 0660   system     system
@@ -403,3 +404,6 @@ firmware_directories /vendor/firmware_mnt/image/
 /sys/class/kgsl/kgsl-3d0    force_bus_on             0664    root  system
 /sys/class/kgsl/kgsl-3d0    force_clk_on             0664    root  system
 /sys/class/kgsl/kgsl-3d0    bus_split                0664    root  system
+
+#DTV
+/dev/isdbt                 0660 oem_5019  oem_5019

sepolicy/vendor/cameraserver.te

@@ -0,0 +1 @@
+get_prop(cameraserver, persist_camera_prop)

sepolicy/vendor/device.te

@@ -0,0 +1 @@
+type isdbt_device, dev_type;

sepolicy/vendor/file.te

@@ -19,3 +19,6 @@ type persist_chargeonly_file, file_type, data_file_type;
 
 # Healthd
 type sysfs_healthd, fs_type, sysfs_type, mlstrustedobject;
+
+# Homebutton
+type sysfs_homebutton, fs_type, sysfs_type, mlstrustedobject;

sepolicy/vendor/file_contexts

@@ -71,3 +71,9 @@
 /sys/devices/soc/800f000\.qcom,spmi/spmi-0/spmi0-00/800f000\.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/power_supply/usb(/.*)?          u:object_r:sysfs_healthd:s0
 /sys/devices/soc/800f000\.qcom,spmi/spmi-0/spmi0-00/800f000\.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/power_supply/usbeb(/.*)?        u:object_r:sysfs_healthd:s0
 /sys/devices/soc/800f000\.qcom,spmi/spmi-0/spmi0-00/800f000\.qcom,spmi:qcom,pm660@0:qcom,qpnp-smb2/power_supply/wireless(/.*)?     u:object_r:sysfs_healthd:s0
+
+# Homebutton
+/sys/homebutton(/.*)?                                         u:object_r:sysfs_homebutton:s0
+
+# DTV
+/dev/isdbt                                               u:object_r:isdbt_device:s0

sepolicy/vendor/hal_camera_default.te

@@ -5,6 +5,7 @@ allow hal_camera_default mnt_vendor_file:file rw_file_perms;
 allow hal_camera_default vendor_data_file:dir read;
 allow hal_camera_default camera_prop:property_service set;
 allow hal_camera_default sysfs_healthd:dir search;
+allow hal_camera_default sysfs:file { getattr open read };
 
 get_prop(hal_camera_default, moto_boot_prop)
 set_prop(hal_camera_default, camera_prop)

sepolicy/vendor/init.te

@@ -13,3 +13,5 @@ allow init fsg_firmware_file:filesystem getattr;
 allow init vendor_data_file:file lock;
 allow init hal_audio_default:binder call;
 allow init platform_app:binder call;
+
+allow init system_file:system module_load;

sepolicy/vendor/isdbt_app.te

@@ -0,0 +1,10 @@
+type isdbt_app, domain, mlstrustedsubject;
+app_domain(isdbt_app)
+binder_use(isdbt_app)
+allow isdbt_app isdbt_device:chr_file rw_file_perms;
+allow isdbt_app media_rw_data_file:dir { rw_dir_perms create getattr rmdir search };
+allow isdbt_app { accessibility_service activity_service appops_service connectivity_service content_service display_service graphicsstats_service input_method_service input_service location_service mount_service network_management_service radio_service registry_service surfaceflinger_service textservices_service uimode_service vibrator_service wifi_service audio_service audioserver_service media_router_service notification_service autofill_service mediametrics_service mediaserver_service media_session_service mediametrics_service batterystats_service power_service user_service }:service_manager find;
+allow isdbt_app telecom_service:service_manager find;
+allow isdbt_app activity_task_service:service_manager find;
+allow isdbt_app gpu_service:service_manager find;
+allow isdbt_app uri_grants_service:service_manager find;

sepolicy/vendor/platform_app.te

@@ -1,3 +1,6 @@
+typeattribute platform_app mlstrustedsubject;
+
+allow platform_app isdbt_device:chr_file rw_file_perms; 
 allow platform_app sysfs_kgsl:dir search;
 allow platform_app sysfs_kgsl:file { getattr open read };
 allow platform_app sysfs_healthd:dir r_dir_perms;

sepolicy/vendor/seapp_contexts

@@ -0,0 +1,2 @@
+user=_app seinfo=platform name=com.motorola.dtv domain=isdbt_app type=app_data_file levelFrom=user
+user=_app seinfo=platform name=com.motorola.dtvservice domain=isdbt_app type=app_data_file levelFrom=user

sepolicy/vendor/system_app.te

@@ -1,2 +1,5 @@
 get_prop(system_app, vendor_fm_prop)
 get_prop(system_app, hwrev_prop)
+allow system_app sysfs_homebutton:file write;
+allow system_app sysfs_homebutton:dir search;
+allow system_app sysfs_homebutton:file { getattr open };

sepolicy/vendor/system_server.te

@@ -6,3 +6,5 @@ allow system_server vendor_keylayout_file:dir r_dir_perms;
 allow system_server vendor_keylayout_file:file r_file_perms;
 allow system_server vendor_idc_file:dir r_dir_perms;
 allow system_server vendor_idc_file:file r_file_perms;
+allow system_server sysfs_homebutton:file rw_file_perms;
+allow system_server sysfs_homebutton:dir r_dir_perms;