From a723b1fce2cb52294719faacac8f26a3173d01d5 Mon Sep 17 00:00:00 2001
From: sub77 <sub77@ymail.com>
Date: Sat, 2 Apr 2016 00:46:36 -0500
Subject: [PATCH] Revert "Update vendor blobs"
This reverts commit 51ea9b3b7fd2551765a8a162bc40b472a59084f6.
---
BoardConfig.mk | 4 +-
extract-files.sh | 57 +------------
.../base/core/res/res/values/config.xml | 67 ---------------
.../SettingsProvider/res/values/defaults.xml | 22 +++++
.../packages/SystemUI/res/values/config.xml | 30 +++++++
.../services/Telephony/res/values/config.xml | 2 +
proprietary-files.txt | 11 +--
proprietary-files.txt-K | 35 ++++++++
setup-makefiles.sh | 85 ++-----------------
system.prop | 6 --
10 files changed, 104 insertions(+), 215 deletions(-)
create mode 100644 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/config.xml
create mode 100644 proprietary-files.txt-K
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c590d1f..6090fe7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -33,5 +33,5 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
# Releasetools
TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
-# Sensors
-TARGET_NO_SENSOR_PERMISSION_CHECK := true
+# inherit from the proprietary version
+-include vendor/samsung/matisse3g/BoardConfigVendor.mk
diff --git a/extract-files.sh b/extract-files.sh
index bfe283a..686440a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -2,59 +2,6 @@
set -e
-export DEVICE=matisse3g
export VENDOR=samsung
-
-function extract() {
- for FILE in `egrep -v '(^#|^$)' $1`; do
- OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
- FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
- DEST=${PARSING_ARRAY[1]}
- if [ -z $DEST ]; then
- DEST=$FILE
- fi
- DIR=`dirname $FILE`
- if [ ! -d $2/$DIR ]; then
- mkdir -p $2/$DIR
- fi
- if [ "$SRC" = "adb" ]; then
- # Try CM target first
- adb pull /system/$DEST $2/$DEST
- # if file does not exist try OEM target
- if [ "$?" != "0" ]; then
- adb pull /system/$FILE $2/$DEST
- fi
- else
- cp $SRC/system/$FILE $2/$DEST
- # if file dot not exist try destination
- if [ "$?" != "0" ]
- then
- cp $SRC/system/$DEST $2/$DEST
- fi
- fi
- done
-}
-
-if [ $# -eq 0 ]; then
- SRC=adb
-else
- if [ $# -eq 1 ]; then
- SRC=$1
- else
- echo "$0: bad number of arguments"
- echo ""
- echo "usage: $0 [PATH_TO_EXPANDED_ROM]"
- echo ""
- echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from"
- echo "the device using adb pull."
- exit 1
- fi
-fi
-
-DEVBASE=../../../vendor/$VENDOR/$DEVICE/proprietary
-rm -rf $DEVBASE/*
-
-extract ../../$VENDOR/$DEVICE/proprietary-files.txt $DEVBASE
-
-./setup-makefiles.sh
-
+export DEVICE=matisse3g
+./../../$VENDOR/matisse-common/extract-files.sh $@
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a0a4778..4ed1be4 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -21,73 +21,6 @@
for different hardware and product builds. -->
<resources>
- <!-- This string array should be overridden by the device to present a list of network
- attributes. This is used by the connectivity manager to decide which networks can coexist
- based on the hardware -->
- <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
- [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet] -->
- <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
- before automatically restore the default connection. Set -1 if the connection
- does not require auto-restore. -->
- <!-- the 6th element indicates boot-time dependency-met value. -->
- <string-array translatable="false" name="networkAttributes">
- <item>wifi,1,1,1,-1,true</item>
- <item>mobile,0,0,0,-1,true</item>
- <item>mobile_mms,2,0,2,180000,true</item>
- <item>mobile_supl,3,0,2,60000,true</item>
- <item>mobile_dun,4,0,2,60000,true</item>
- <item>mobile_hipri,5,0,3,60000,true</item>
- <item>bluetooth,7,7,0,-1,true</item>
- <item>wifi_p2p,13,1,0,-1,true</item>
- </string-array>
-
- <!-- An Array of "[ConnectivityManager connectionType],
- [# simultaneous connection types]" -->
- <string-array translatable="false" name="radioAttributes">
- <item>"1,1"</item>
- <item>"0,1"</item>
- <item>"7,1"</item>
- </string-array>
-
- <!-- List of regexpressions describing the interface (if any) that represent tetherable
- USB interfaces. If the device doesn't want to support tething over USB this should
- be empty. An example would be "usb.*" -->
- <string-array translatable="false" name="config_tether_usb_regexs">
- <item>"rndis0"</item>
- <item>"usb0"</item>
- </string-array>
-
- <!-- Configure mobile tcp buffer sizes in the form:
- rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
- If no value is found for the rat-name in use, the system default will be applied.-->
- <string-array name="config_mobile_tcp_buffers">
- <item>"lte:2097152,4194304,8388608,262144,524288,1048576"</item>
- <item>"lte_ca:2097152,4194304,8388608,262144,524288,1048576"</item>
- <item>"umts:4094,87380,1220608,4096,16384,1220608"</item>
- <item>"hspa:4094,87380,1220608,4096,16384,1220608"</item>
- <item>"hsupa:4094,87380,1220608,4096,16384,1220608"</item>
- <item>"hsdpa:4094,87380,2441216,4096,16384,2441216"</item>
- <item>"hspap:4094,87380,1220608,4096,16384,1220608"</item>
- <item>"edge:4093,26280,35040,4096,16384,35040"</item>
- <item>"gprs:4092,8760,11680,4096,8760,11680"</item>
- <item>"evdo:4094,87380,1048576,4096,16384,262144"</item>
- <item>"ehrpd:4094,87380,1048576,4096,16384,262144"</item>
- </string-array>
-
- <!-- Configure wifi tcp buffersizes in the form:
- rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
- <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,4194304,262144,524288,1048576</string>
-
- <!-- Boolean indicating if restoring network selection should be skipped -->
- <!-- The restoring is handled by modem if it is true-->
- <bool name="skip_restoring_network_selection">true</bool>
-
- <!-- The RadioAccessFamilies supported by the device.
- Empty is viewed as "all". Only used on devices which
- don't support RIL_REQUEST_GET_RADIO_CAPABILITY
- format is UMTS|LTE|... -->
- <string translatable="false" name="config_radio_access_family">GSM|WCDMA</string>
-
<!-- This device is not "voice capable"; it's data-only. -->
<bool name="config_voice_capable">true</bool>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..d6ae428
--- /dev/null
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2012, The CyanogenMod 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.
+ */
+-->
+<resources>
+ <bool name="def_screen_brightness_automatic_mode">true</bool>
+</resources>
+
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..f349d47
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <!-- Control whether status bar should distinguish HSPA data icon form UMTS
+ data icon on devices -->
+ <bool name="config_hspa_data_distinguishable">true</bool>
+ <!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND? -->
+ <bool name="doze_display_state_supported">true</bool>
+ <bool name="doze_pulse_on_pick_up">true</bool>
+</resources>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 243bc39..8dead20 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -26,4 +26,6 @@
<!-- This device implements a noise suppression device for in call audio-->
<bool name="has_in_call_noise_suppression">true</bool>
+ <!-- Show enabled lte option for lte device -->
+ <bool name="config_enabled_lte" translatable="false">true</bool>
</resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0785e98..b8f4da4 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,5 +1,7 @@
# Qualcomm framework
vendor/lib/libdiag.so
+#vendor/lib/libdsnetutils.so
+#vendor/lib/libdsucsd.so
vendor/lib/libdsutils.so
vendor/lib/libidl.so
vendor/lib/libqcci_legacy.so
@@ -8,12 +10,12 @@ vendor/lib/libqmi_cci.so
vendor/lib/libqmi_client_qmux.so
vendor/lib/libqmi_common_so.so
vendor/lib/libqmi_csi.so
+#vendor/lib/libqmi_csvt_srvc.so
vendor/lib/libqmi_encdec.so
vendor/lib/libqmiservices.so
-#vendor/lib/libcsd-client.so
-#vendor/lib/libqc-opt.so
# Radio
+#bin/ds_fmc_appd
bin/qmuxd
bin/radish
bin/rfs_access
@@ -24,11 +26,10 @@ lib/libcordon.so
lib/libfactoryutil.so
lib/libomission_avoidance.so
lib/libreference-ril.so
-lib/libril.so
+#lib/libril.so
lib/libsec-ril.so
-#lib/libsec-ril-dsds.so
lib/libsecnativefeature.so
lib/libsecril-client.so
vendor/lib/libconfigdb.so
vendor/lib/libril-qcril-hook-oem.so
-vendor/lib/libxml.so
\ No newline at end of file
+vendor/lib/libxml.so
diff --git a/proprietary-files.txt-K b/proprietary-files.txt-K
new file mode 100644
index 0000000..ae6cc36
--- /dev/null
+++ b/proprietary-files.txt-K
@@ -0,0 +1,35 @@
+# Qualcomm framework
+vendor/lib/libdiag.so
+vendor/lib/libdsnetutils.so
+vendor/lib/libdsucsd.so
+vendor/lib/libdsutils.so
+vendor/lib/libidl.so
+vendor/lib/libqcci_legacy.so
+vendor/lib/libqmi.so
+vendor/lib/libqmi_cci.so
+vendor/lib/libqmi_client_qmux.so
+vendor/lib/libqmi_common_so.so
+vendor/lib/libqmi_csi.so
+vendor/lib/libqmi_csvt_srvc.so
+vendor/lib/libqmi_encdec.so
+vendor/lib/libqmiservices.so
+
+# Radio
+bin/ds_fmc_appd
+bin/qmuxd
+bin/radish
+bin/rfs_access
+bin/rild
+bin/rmt_storage
+lib/libatparser.so
+lib/libcordon.so
+lib/libfactoryutil.so
+lib/libomission_avoidance.so
+lib/libreference-ril.so
+lib/libril.so
+lib/libsec-ril.so
+lib/libsecnativefeature.so
+lib/libsecril-client.so
+vendor/lib/libconfigdb.so
+vendor/lib/libril-qcril-hook-oem.so
+vendor/lib/libxml.so
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index b5b6050..1fa3c86 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,82 +1,7 @@
-OUTDIR=vendor/$VENDOR/$DEVICE
-MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk
-
-(cat << EOF) > $MAKEFILE
-# Copyright (C) 2014 The CyanogenMod 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.
-
-# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
-
-PRODUCT_COPY_FILES += \\
-EOF
-
-LINEEND=" \\"
-COUNT=`wc -l proprietary-files.txt | awk {'print $1'}`
-DISM=`egrep -c '(^#|^$)' proprietary-files.txt`
-COUNT=`expr $COUNT - $DISM`
-for FILE in `egrep -v '(^#|^$)' proprietary-files.txt`; do
- COUNT=`expr $COUNT - 1`
- if [ $COUNT = "0" ]; then
- LINEEND=""
- fi
- # Split the file from the destination (format is "file[:destination]")
- OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
- if [[ ! "$FILE" =~ ^-.* ]]; then
- FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
- DEST=${PARSING_ARRAY[1]}
- if [ -n "$DEST" ]; then
- FILE=$DEST
- fi
- echo " $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE
- fi
-done
-
-(cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.mk
-# Copyright (C) 2014 The CyanogenMod 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.
-
-# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
-
-EOF
-
-(cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk
-# Copyright (C) 2014 The CyanogenMod 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.
-
-# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
-EOF
+#!/bin/bash
+set -e
+export VENDOR=samsung
+export DEVICE=matisse3g
+./../../$VENDOR/matisse-common/setup-makefiles.sh $@
diff --git a/system.prop b/system.prop
index 848f6fd..ec6323a 100644
--- a/system.prop
+++ b/system.prop
@@ -9,9 +9,3 @@ rild.libpath=/system/lib/libsec-ril.so
ro.telephony.ril_class=SamsungMSM8226RIL
ro.telephony.ril.config=simactivation
ro.use_data_netmgrd=false
-
-# Qualcomm
-ro.vendor.extension_library=/vendor/lib/libqti-perfd-client.so
-
-# Disable Strict Mode
-persist.sys.strictmode.disable=true
--
GitLab