Skip to content
Snippets Groups Projects
Commit 516ce1b0 authored by LMO GerritBot's avatar LMO GerritBot
Browse files

Merge branch lineage-19.1 from LineageOS into twelve

Change-Id: I3c2d85467ce306fe8579fce45499b775f91fefd3
parents e7819acf b3dee12f
Branches twelve
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ AB_OTA_PARTITIONS += \ ...@@ -28,6 +28,7 @@ AB_OTA_PARTITIONS += \
vendor vendor
# Assertions # Assertions
TARGET_BOARD_INFO_FILE := device/motorola/beckham/board-info.txt
TARGET_OTA_ASSERT_DEVICE := beckham TARGET_OTA_ASSERT_DEVICE := beckham
# Audio # Audio
......
require board=sdm660|beckham|beckham_retail
...@@ -20,7 +20,7 @@ function blob_fixup() { ...@@ -20,7 +20,7 @@ function blob_fixup() {
;; ;;
# Add uhid group for fingerprint service # Add uhid group for fingerprint service
vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc) vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc)
sed -i "s/input/uhid input/" "${2}" sed -i "s/system input/system uhid input/" "${2}"
;; ;;
# Replace libcutils with libprocessgroup # Replace libcutils with libprocessgroup
vendor/lib/hw/audio.primary.sdm660.so) vendor/lib/hw/audio.primary.sdm660.so)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
########################## Start of libnfc-nci.conf ########################### ########################## Start of libnfc-nci.conf ###########################
############################################################################### ###############################################################################
# Application options # Application options
NFC_DEBUG_ENABLED=0x01 NFC_DEBUG_ENABLED=0x00
############################################################################### ###############################################################################
# performance measurement # performance measurement
......
...@@ -14,12 +14,13 @@ ...@@ -14,12 +14,13 @@
# ANDROID_LOG_WARN 0x02 # ANDROID_LOG_WARN 0x02
# ANDROID_LOG_ERROR 0x01 # ANDROID_LOG_ERROR 0x01
# ANDROID_LOG_SILENT 0x00 # ANDROID_LOG_SILENT 0x00
NXPLOG_EXTNS_LOGLEVEL=0x03 NXPLOG_EXTNS_LOGLEVEL=0x02
NXPLOG_NCIHAL_LOGLEVEL=0x03 NXPLOG_NCIHAL_LOGLEVEL=0x02
NXPLOG_NCIX_LOGLEVEL=0x03 NXPLOG_NCIX_LOGLEVEL=0x02
NXPLOG_NCIR_LOGLEVEL=0x03 NXPLOG_NCIR_LOGLEVEL=0x02
NXPLOG_FWDNLD_LOGLEVEL=0x03 NXPLOG_FWDNLD_LOGLEVEL=0x02
NXPLOG_TML_LOGLEVEL=0x03 NXPLOG_TML_LOGLEVEL=0x02
NFC_DEBUG_ENABLED=0x00
############################################################################### ###############################################################################
# Nfc Device Node name # Nfc Device Node name
......
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
<!-- Whether device has a screen with a higher aspect ratio --> <!-- Whether device has a screen with a higher aspect ratio -->
<bool name="config_haveHigherAspectRatioScreen">true</bool> <bool name="config_haveHigherAspectRatioScreen">true</bool>
<!-- The list of vendor package signatures that should also be considered
platform signatures, specifically for use on devices with a vendor partition. -->
<string-array name="config_vendorPlatformSignatures" translatable="false">
<item>308203c5308202ada003020102020213ae300d06092a864886f70d01010505003076310b30090603550406130255533111300f06035504081308496c6c696e6f6973311530130603550407130c4c69626572747976696c6c653111300f060355040a13084d6f746f726f6c61310c300a060355040b13034d4d49311c301a06035504031313436f6d6d6f6e204d6f746f424c555220322d31301e170d3131303331353232343430355a170d3336303331353232343430355a3078310b30090603550406130255533111300f06035504081308496c6c696e6f6973311530130603550407130c4c69626572747976696c6c653111300f060355040a13084d6f746f726f6c61310c300a060355040b13034d4d49311e301c06035504031315436f6d6d6f6e204d6f746f424c555220322d312d3130820122300d06092a864886f70d01010105000382010f003082010a0282010100bdbc690d0a26c6c953c5900b1ebb303ee791edbad39950f1b185cfc75f9cc6268a4cb7aadf4eb87d3ba7bf982e0ede6a9e3a41b07d84a626b4bd6e37a9feb4a96add829913e7b5e7a9575616f91f22c6dcec9e0293183d419d50f62756b22cd6d8284f8be17fa1c422eac27738c3a9c937d0313e3417ab6f4bb2cdc13f2f77b160b0ff87357b8983d8ea729a7135d88020c6fbca873f78f567a4092cdf28999d459cb8943d7b1e6e35cde5b035fdb63944b78d026fd291476fc385df694e42b1db443dd1ffb427f37d26dcd8cf1d8380fe6a094c1b45c924f1addd2e90d67a32bb8de5b146f47c7bfeae5286c810fa51762b073b58dabf6494a47032595f60410203010001a35b3059301f0603551d23041830168014b3c62fe567c28d4489abc7abbdce60030ca6b62c301106096086480186f8420101040403020410300e0603551d0f0101ff0404030205e030130603551d25040c300a06082b06010505070303300d06092a864886f70d010105050003820101001384fcff397bbc871c55033830f4ca3de5c7d47116c79eb6c0ae152faec03a284c44bc39e3d3756467da60fa89cdd6546e4fd4b182faba3e833093ad8d6b975b5d72836e784f3e3a0ac34d7e83efbfa6c9601e54200415f5ccfcb2555430249ce5794e493f7a4c534b984ac3810ba09bcc9c5e7d985ff1b0902676ce1546301e91089614167b6b562c8585fea36ef6af6c350d77bad00a234755364eeb0be232d2561fb3e6535991c54a1f46f528a82139b7c62dddc53478d59aa593e79fb0f4610320072378f6101aced914e5da439e223900c46ef19d00763c4c315402ea82b14119a276fe40684bfad8c6bd16611c0b972daa5d18f2dfdd1f9bb1ca7aedfd</item>
</string-array>
<!-- Whether the device supports wireless charging or not --> <!-- Whether the device supports wireless charging or not -->
<bool name="config_deviceSupportsWirelessCharging">true</bool> <bool name="config_deviceSupportsWirelessCharging">true</bool>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment