From 2215a6f62c02c064b6211145e0a14c750ec0e5dd Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <skate4life@gmx.de>
Date: Sun, 30 Oct 2016 13:59:24 +0100
Subject: espresso3g: sync with AOSP

Change-Id: Ibdfa13c5b622aa1781c5311c0b3fedc83cda8e65
---
 BoardConfig.mk            |  3 ---
 README.md                 | 22 ++--------------------
 aosp_espresso3g.mk        |  2 +-
 sepolicy/cpboot-daemon.te |  3 ---
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 87754c6..9c70062 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -23,6 +23,3 @@ TARGET_OTA_ASSERT_DEVICE := espresso3g,espresso-common,p3100,GT-P3100,espressorf
 # SELinux
 BOARD_SEPOLICY_DIRS += \
     device/samsung/espresso3g/sepolicy
-
-# Use the non-open-source parts, if they're present
--include vendor/samsung/espresso3g/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index 994ec3b..1ed6efa 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,2 @@
-Device configuration for Samsung Galaxy Tab 2 10.1 (GT-P5100).
-=====================================
-
-Basic   | Spec Sheet
--------:|:-------------------------
-CPU     | Dual-core 1 GHz Cortex-A9
-CHIPSET | TI OMAP 4430
-GPU     | PowerVR SGX540
-Memory  | 1 GB RAM
-Shipped Android Version | 4.0.3 (upgradeable to 4.2.2)
-Storage | 16/32 GB
-MicroSD | Up to 32 GB
-Battery | 7000 mAh (Non-removable Li-Ion)
-Dimensions | 256.6 x 175.3 x 9.7 mm
-Display | 800 x 1280 pixels, 10.1" PLS TFT
-Rear Camera  | 3.15 MP
-Front Camera | VGA
-Release Date | May 2012
-
-![TAB2](http://cdn2.gsmarena.com/vv/pics/samsung/samsung-galaxy-tab-2-101.jpg "TAB2")
+android_device_samsung_espresso3g
+============================
diff --git a/aosp_espresso3g.mk b/aosp_espresso3g.mk
index 3b3b00f..7955caa 100644
--- a/aosp_espresso3g.mk
+++ b/aosp_espresso3g.mk
@@ -18,7 +18,7 @@
 $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage13.mk)
 
 # Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
 # Inherit device specific configuration
 $(call inherit-product, device/samsung/espresso3g/device.mk)
diff --git a/sepolicy/cpboot-daemon.te b/sepolicy/cpboot-daemon.te
index b06c8f5..08281f4 100644
--- a/sepolicy/cpboot-daemon.te
+++ b/sepolicy/cpboot-daemon.te
@@ -11,6 +11,3 @@ allow cpboot-daemon { block_device efs_file }:dir search;
 unix_socket_connect(cpboot-daemon, property, init)
 
 allow cpboot-daemon radio_prop:property_service set;
-
-# neverallow failures - FIX ME if needed
-# allow cpboot-daemon self:capability mknod;
-- 
cgit v1.1