hammerhead: revert unused aosp testing changesHEADq10.0o8.0n7.1

Squash of reverts to remove unused fingerprint scanner and car bluetooth
profile testing changes added by aosp.

  Revert "Add hammerhead-specific selinux policy for device driver"
  This reverts commit 07d20d57d70877fd86c87a159a9287fc2ebb602c.

  Revert "hammerhead_fp: copy supplicant overlay config"
  This reverts commit 218726fbe44e8f9340e298ac1f75b03ba239118f.

  Revert "Fingerprint: select friendly wifi firmware for the frankenphone config."
  This reverts commit bbbf3be9a5624f4d302562fadfd1fa96b1d7f6ed.

  Revert "Add fingerprint config to *hammerhead_fp target"
  This reverts commit a3d8bcd96adf4d09da49a5f29d6876c76d5ef83a.

  Revert "hammerhead_fp: define BOARD_HAS_FINGERPRINT_FPC"
  This reverts commit 3cdefc707e980245bfbb209f40e12c607f05e767.

  Revert "Add car_hammerhead build for Bluetooth automotive profile testing"
  This reverts commit fc8dd104865fc3b8cf86098ae847ab4d5498fda9.

Change-Id: I344531e8e7bf9a22535aa029a8deb42bdb51c802

15 files changed, 2 insertions, 182 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4a05c56..e061d1a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,7 +16,4 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_hammerhead.mk \
-    $(LOCAL_DIR)/aosp_hammerhead_fp.mk \
-    $(LOCAL_DIR)/full_hammerhead.mk \
-    $(LOCAL_DIR)/car_hammerhead.mk
-
+    $(LOCAL_DIR)/full_hammerhead.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6b019b5..07e2337 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -45,12 +45,7 @@ BOARD_USES_ALSA_AUDIO := true
 
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
-
-ifeq ($(TARGET_PRODUCT),car_hammerhead)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/hammerhead/bluetooth_car
-else
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/lge/hammerhead/bluetooth
-endif
 
 # Wifi related defines
 WPA_SUPPLICANT_VERSION      := VER_0_8_X
@@ -104,10 +99,6 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 TARGET_KERNEL_CONFIG := lineageos_hammerhead_defconfig
 TARGET_KERNEL_SOURCE := kernel/lge/hammerhead
 
-ifneq ($(filter hammerhead_fp aosp_hammerhead_fp,$(TARGET_PRODUCT)),)
-BOARD_HAS_FINGERPRINT_FPC := true
-endif
-
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
 TARGET_RECOVERY_FSTAB = device/lge/hammerhead/fstab.hammerhead
@@ -118,17 +109,6 @@ BOARD_HAL_STATIC_LIBRARIES := libdumpstate.hammerhead
 
 BOARD_SEPOLICY_DIRS += device/lge/hammerhead/sepolicy
 
-ifneq ($(filter hammerhead_fp aosp_hammerhead_fp,$(TARGET_PRODUCT)),)
-BOARD_SEPOLICY_DIRS += \
-       device/lge/hammerhead/sepolicy-hammerhead_fp
-
-# The list below is order dependent
-BOARD_SEPOLICY_UNION += \
-       device.te \
-       system_server.te \
-       file_contexts
-endif
-
 HAVE_ADRENO_SOURCE:= false
 
 OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
diff --git a/aosp_hammerhead_fp.mk b/aosp_hammerhead_fp.mk
deleted file mode 100644
index f0c375b..0000000
--- a/aosp_hammerhead_fp.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-PRODUCT_PACKAGES := \
-    fingerprint.hammerhead
-
-PRODUCT_LOCALES := en_US
-$(call inherit-product, device/lge/hammerhead/aosp_hammerhead.mk)
-
-PRODUCT_NAME := aosp_hammerhead_fp
-PRODUCT_DEVICE := hammerhead
diff --git a/audio_policy.conf b/audio_policy.conf
index e9d431b..4153ec6 100644
--- a/audio_policy.conf
+++ b/audio_policy.conf
@@ -85,14 +85,6 @@ audio_hw_modules {
         devices AUDIO_DEVICE_OUT_ALL_A2DP
       }
     }
-    inputs {
-      a2dp {
-        sampling_rates 44100|48000
-        channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
-        formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_IN_BLUETOOTH_A2DP
-      }
-    }
   }
   usb {
     outputs {
diff --git a/bluetooth_car/bdroid_buildcfg.h b/bluetooth_car/bdroid_buildcfg.h
deleted file mode 100644
index 61aea5c..0000000
--- a/bluetooth_car/bdroid_buildcfg.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-
-#define BTA_DISABLE_DELAY 100 /* in milliseconds */
-
-#define BTM_WBS_INCLUDED TRUE
-#define BTIF_HF_WBS_PREFERRED TRUE
-
-/* Handsfree device */
-#define BTA_DM_COD {0x20, 0x04, 0x08}
-
-/* Enable A2DP sink */
-#define BTA_AV_SINK_INCLUDED TRUE
-
-#endif
diff --git a/car_hammerhead.mk b/car_hammerhead.mk
deleted file mode 100644
index fe2b068..0000000
--- a/car_hammerhead.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2013 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$(call inherit-product, device/lge/hammerhead/aosp_hammerhead.mk)
-
-# Add overlay to enable Bluetooth automotive profiles
-DEVICE_PACKAGE_OVERLAYS += \
-    device/lge/hammerhead/overlay_car
-
-PRODUCT_NAME := car_hammerhead
-PRODUCT_DEVICE := hammerhead
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Car Hammerhead
-PRODUCT_MANUFACTURER := LGE
-PRODUCT_RESTRICT_VENDOR_FILES := true
diff --git a/device.mk b/device.mk
index a081f33..5c435b6 100644
--- a/device.mk
+++ b/device.mk
@@ -366,21 +366,8 @@ PRODUCT_COPY_FILES += \
     device/lge/hammerhead/init.hammerhead.diag.rc.user:root/init.hammerhead.diag.rc
 endif
 
-ifneq ($(filter hammerhead_fp aosp_hammerhead_fp,$(TARGET_PRODUCT)),)
-PRODUCT_COPY_FILES += \
-    device/lge/hammerhead/init.hammerhead_fp.rc:root/init.hammerhead_fp.rc \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/fw_bcmdhd_fp.bin:system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin:system/vendor/firmware/fw_bcmdhd_apsta.bin
-
-PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/config/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-    hardware/broadcom/wlan/bcmdhd/config/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf
-
-else
-$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
-endif
-
 # setup dalvik vm configs.
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, vendor/qcom/gpu/msm8x74/msm8x74-gpu-vendor.mk)
+$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
diff --git a/init.hammerhead.rc b/init.hammerhead.rc
index cc2e905..2df3f2d 100644
--- a/init.hammerhead.rc
+++ b/init.hammerhead.rc
@@ -17,7 +17,6 @@
 import init.hammerhead.usb.rc
 import init.hammerhead_svelte.rc
 import init.hammerhead.diag.rc
-import init.hammerhead_fp.rc
 
 on early-init
     mount debugfs debugfs /sys/kernel/debug
diff --git a/init.hammerhead_fp.rc b/init.hammerhead_fp.rc
deleted file mode 100644
index b11a525..0000000
--- a/init.hammerhead_fp.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-on boot
-    chown system system /dev/fpc1020
-    chmod 660 /dev/fpc1020
-
-service fingerprintd /system/bin/fingerprintd
-    class late_start
-    user system
diff --git a/overlay_car/packages/apps/Bluetooth/res/values/config.xml b/overlay_car/packages/apps/Bluetooth/res/values/config.xml
deleted file mode 100644
index c1794b2..0000000
--- a/overlay_car/packages/apps/Bluetooth/res/values/config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009-2012 Broadcom Corporation
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<resources>
-    <bool name="profile_supported_a2dp_sink">true</bool>
-    <bool name="profile_supported_avrcp_controller">true</bool>
-    <bool name="profile_supported_hfpclient">true</bool>
-</resources>
diff --git a/sepolicy-hammerhead_fp/device.te b/sepolicy-hammerhead_fp/device.te
deleted file mode 100644
index bb3e905..0000000
--- a/sepolicy-hammerhead_fp/device.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fingerprint device
-type fpc1020_device, dev_type;
diff --git a/sepolicy-hammerhead_fp/file.te b/sepolicy-hammerhead_fp/file.te
deleted file mode 100644
index effa0eb..0000000
--- a/sepolicy-hammerhead_fp/file.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# sysfs directory file
-type sysfs_fingerprintd, fs_type, sysfs_type;
diff --git a/sepolicy-hammerhead_fp/file_contexts b/sepolicy-hammerhead_fp/file_contexts
deleted file mode 100644
index 84c569e..0000000
--- a/sepolicy-hammerhead_fp/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fingerprint device
-/dev/fpc1020 u:object_r:fpc1020_device:s0
diff --git a/sepolicy-hammerhead_fp/fingerprintd.te b/sepolicy-hammerhead_fp/fingerprintd.te
deleted file mode 100644
index f51e8bb..0000000
--- a/sepolicy-hammerhead_fp/fingerprintd.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fingerprint device
-allow fingerprintd fpc1020_device:chr_file rw_file_perms;
-allow fingerprintd sysfs:file rw_file_perms;
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 48e9c22..ef4f8e1 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -15,4 +15,3 @@
 #
 
 add_lunch_combo aosp_hammerhead-userdebug
-add_lunch_combo aosp_hammerhead_fp-userdebug