From c9e33bd425d5e9e3c292550dc0096df58dc54b15 Mon Sep 17 00:00:00 2001 From: Shane Francis Date: Fri, 16 Jan 2015 20:16:18 +0530 Subject: camera: Add credential manager and friends * Welcome back, idd. * Happy troling, suntrold Change-Id: Ic447a8e7769903bfb8ec3bf4fdd4f74406671f78 --- BoardConfigCommon.mk | 2 +- proprietary-files.txt | 8 ++++++++ rootdir/fstab.qcom | 1 + rootdir/init.qcom.rc | 16 ++++++++++++++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f37cad5..72b3b48 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -23,7 +23,7 @@ BOARD_VENDOR_PLATFORM := shinano # Kernel information BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 2048 -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1 vmalloc=300M dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y display_status=on +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y androidboot.selinux=permissive BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01E00000 BOARD_KERNEL_SEPARATED_DT := true TARGET_DTB_EXTRA_FLAGS := --force-v2 diff --git a/proprietary-files.txt b/proprietary-files.txt index 57ba4dc..afea97d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -11,12 +11,20 @@ vendor/lib/soundfx/libqcvirt.so vendor/lib/libadsprpc.so # Camera +bin/credmgrd +bin/iddd bin/mm-qcamera-daemon +etc/iddd.conf etc/firmware/cpp_firmware_v1_1_1.fw etc/firmware/cpp_firmware_v1_1_6.fw etc/firmware/cpp_firmware_v1_2_0.fw lib/hw/camera.qcom.so:lib/hw/camera.vendor.qcom.so +lib/lib_get_secure_mode.so +lib/lib_get_rooting_status.so lib/libcamera_clientsemc.so +lib/libcredential-manager-keystore.so +lib/libcredential-manager-service.so +lib/libidd.so lib/liblights-core.so lib/libmmcamera_interface.so lib/libmmjpeg_interface.so diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom index 3e31bc7..94cb00d 100644 --- a/rootdir/fstab.qcom +++ b/rootdir/fstab.qcom @@ -10,6 +10,7 @@ /dev/block/platform/msm_sdcc.1/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic wait,check /dev/block/platform/msm_sdcc.1/by-name/userdata /data f2fs noatime,nosuid,nodev,rw,inline_xattr wait,check,formattable,encryptable=footer,length=-16384 /dev/block/platform/msm_sdcc.1/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc,errors=panic wait,check,encryptable=footer,length=-16384 +/dev/block/platform/msm_sdcc.1/by-name/apps_log /mnt/idd ext4 nosuid,nodev,noatime,noexec,discard wait,check /devices/msm_sdcc.2/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/msm_sdcc.3/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 046b3ed..56e152c 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -476,13 +476,25 @@ service mpdecision /system/bin/mpdecision --avg_comp user root group system +service iddd /system/bin/iddd + class main + user root + group root log + # Start suntrold service suntrold /system/bin/suntrold - user system - group system + user root + group root oneshot class main +# Start Credential manager daemon +service credmgrd /system/bin/credmgrd + user root + group root + socket credmgr stream 0777 system system + class main + # bugreport is triggered by holding down volume down, volume up and power service bugreport /system/bin/dumpstate -d -p -B \ -o /data/data/com.android.shell/files/bugreports/bugreport -- cgit v1.2.3