diff --git a/build/envsetup.sh b/build/envsetup.sh
index f1fafc58..73db9558 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -837,7 +837,7 @@ function dopush()
CHKPERM="/data/local/tmp/chkfileperm.sh"
(
cat <<'EOF'
-#!/system/xbin/sh
+#!/system/bin/sh
FILE=$@
if [ -e $FILE ]; then
ls -l $FILE | awk '{k=0;for(i=0;i<=8;i++)k+=((substr($1,i+2,1)~/[rwx]/)*2^(8-i));if(k)printf("%0o ",k);print}' | cut -d ' ' -f1
@@ -883,7 +883,7 @@ EOF
fi
adb shell restorecon "$TARGET"
;;
- /system/priv-app/SystemUI/SystemUI.apk|/system/framework/*)
+ */SystemUI.apk|*/framework/*)
# Only need to stop services once
if ! $stop_n_start; then
adb shell stop
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 9e3e1405..97aa37de 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -55,6 +55,8 @@
# aarch64-linux-gnu- for arm64
# x86_64-linux-gnu- for x86
#
+# KERNEL_LTO = Optional, force LTO to none / thin / full
+#
# NEED_KERNEL_MODULE_ROOT = Optional, if true, install kernel
# modules in root instead of vendor
# NEED_KERNEL_MODULE_SYSTEM = Optional, if true, install kernel
@@ -275,6 +277,31 @@ endef
# $(2): The defconfig to process (just the filename, no need for full path to file)
define make-kernel-config
$(call internal-make-kernel-target,$(1),VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(2))
+ $(hide) if [ "$(KERNEL_LTO)" = "none" ]; then \
+ $(KERNEL_SRC)/scripts/config --file $(1)/.config \
+ -d LTO_CLANG \
+ -e LTO_NONE \
+ -d LTO_CLANG_THIN \
+ -d LTO_CLANG_FULL \
+ -d THINLTO; \
+ $(call make-kernel-target,olddefconfig); \
+ elif [ "$(KERNEL_LTO)" = "thin" ]; then \
+ $(KERNEL_SRC)/scripts/config --file $(1)/.config \
+ -e LTO_CLANG \
+ -d LTO_NONE \
+ -e LTO_CLANG_THIN \
+ -d LTO_CLANG_FULL \
+ -e THINLTO; \
+ $(call make-kernel-target,olddefconfig); \
+ elif [ "$(KERNEL_LTO)" = "full" ]; then \
+ $(KERNEL_SRC)/scripts/config --file $(1)/.config \
+ -e LTO_CLANG \
+ -d LTO_NONE \
+ -d LTO_CLANG_THIN \
+ -e LTO_CLANG_FULL \
+ -d THINLTO; \
+ $(call make-kernel-target,olddefconfig); \
+ fi
$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
echo $(KERNEL_CONFIG_OVERRIDE) >> $(1)/.config; \
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 06be8beb..70c947db 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -11,7 +11,7 @@ LAHAINA := lahaina #SM8350
B_FAMILY := msm8226 msm8610 msm8974
B64_FAMILY := msm8992 msm8994
BR_FAMILY := msm8909 msm8916
-UM_3_18_FAMILY := msm8937 msm8953 msm8996
+UM_3_18_FAMILY := msm8937 msm8996
UM_4_4_FAMILY := msm8998 sdm660
UM_4_9_FAMILY := sdm845 sdm710
UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
@@ -20,6 +20,12 @@ UM_5_4_FAMILY := $(LAHAINA)
UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
+ifeq (,$(TARGET_ENFORCE_QSSI))
+UM_3_18_FAMILY += msm8953
+else
+QSSI_SUPPORTED_PLATFORMS += msm8953
+endif
+
BOARD_USES_ADRENO := true
# Add qtidisplay to soong config namespaces
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 47658042..4dfc61b2 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -44,7 +44,7 @@ SOONG_CONFIG_lineageGlobalVars += \
SOONG_CONFIG_NAMESPACES += lineageNvidiaVars
SOONG_CONFIG_lineageNvidiaVars += \
- uses_nv_enhancements
+ uses_nvidia_enhancements
SOONG_CONFIG_NAMESPACES += lineageQcomVars
SOONG_CONFIG_lineageQcomVars += \
@@ -70,7 +70,7 @@ SOONG_CONFIG_lineageGlobalVars_has_memfd_backport := $(TARGET_HAS_MEMFD_BACKPORT
SOONG_CONFIG_lineageGlobalVars_ignores_ftp_pptp_conntrack_failure := $(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE)
SOONG_CONFIG_lineageGlobalVars_needs_camera_boottime := $(TARGET_CAMERA_BOOTTIME_TIMESTAMP)
SOONG_CONFIG_lineageGlobalVars_needs_netd_direct_connect_rule := $(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE)
-SOONG_CONFIG_lineageNvidiaVars_uses_nv_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
+SOONG_CONFIG_lineageNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
SOONG_CONFIG_lineageQcomVars_legacy_hw_disk_encryption := $(TARGET_LEGACY_HW_DISK_ENCRYPTION)
SOONG_CONFIG_lineageQcomVars_should_wait_for_qsee := $(TARGET_KEYMASTER_WAIT_FOR_QSEE)
SOONG_CONFIG_lineageQcomVars_supports_extended_compress_format := $(AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT)
diff --git a/config/common.mk b/config/common.mk
index c21b931d..e66c9acc 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -141,7 +141,6 @@ PRODUCT_PACKAGES += \
setcap \
unrar \
vim \
- wget \
zip
# Filesystems tools
diff --git a/config/partner_gms.mk b/config/partner_gms.mk
index ee04bd01..fd36a380 100644
--- a/config/partner_gms.mk
+++ b/config/partner_gms.mk
@@ -1,14 +1,16 @@
ifeq ($(WITH_GMS),true)
ifeq ($(WITH_GMS_TV),true)
-$(call inherit-product-if-exists, vendor/partner_gms-tv/products/gms.mk)
+$(call inherit-product, vendor/partner_gms-tv/products/gms.mk)
+else ifeq ($(WITH_GMS_CAR),true)
+$(call inherit-product, vendor/partner_gms-car/products/gms.mk)
else ifeq ($(WITH_GMS_FI),true)
-$(call inherit-product-if-exists, vendor/partner_gms/products/fi.mk)
+$(call inherit-product, vendor/partner_gms/products/fi.mk)
else ifeq ($(WITH_GMS_GO),true)
-$(call inherit-product-if-exists, vendor/partner_gms/products/gms_go.mk)
+$(call inherit-product, vendor/partner_gms/products/gms_go.mk)
else ifeq ($(WITH_GMS_GO_2GB),true)
-$(call inherit-product-if-exists, vendor/partner_gms/products/gms_go_2gb.mk)
+$(call inherit-product, vendor/partner_gms/products/gms_go_2gb.mk)
else ifeq ($(WITH_GMS_MINIMAL),true)
-$(call inherit-product-if-exists, vendor/partner_gms/products/gms_minimal.mk)
+$(call inherit-product, vendor/partner_gms/products/gms_minimal.mk)
else
$(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
endif
diff --git a/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png b/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png
new file mode 100644
index 00000000..21b7d763
Binary files /dev/null and b/overlay/common/frameworks/base/core/res/res/drawable-large-notouch/default_wallpaper.png differ
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 85e6badd..bcab6514 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -49,6 +49,8 @@
- com.android.vending/com.google.android.finsky.systemupdate.SystemUpdateSettingsContentProvider
- com.android.vending/com.google.android.finsky.systemupdateactivity.SettingsSecurityEntryPoint
- com.android.vending/com.google.android.finsky.systemupdateactivity.SystemUpdateActivity
+ - com.google.android.gms/com.google.android.gms.update.phone.PopupDialog
+ - com.google.android.gms/com.google.android.gms.update.OtaSuggestionSummaryProvider
- com.google.android.gms/com.google.android.gms.update.SystemUpdateActivity
- com.google.android.gms/com.google.android.gms.update.SystemUpdateGcmTaskService
- com.google.android.gms/com.google.android.gms.update.SystemUpdateService
@@ -100,6 +102,11 @@
-->
com.google.android.apps.wellbeing
+
+ com.google.android.gms/.kids.account.receiver.ProfileOwnerReceiver
+
diff --git a/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index 93db9e96..92cf8fce 100644
--- a/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -20,6 +20,17 @@
+
+
+
+
+
+
+ vvm_carrier_flag_el_telecom
+
+ 8860
+ vvm_type_omtp_1_3
+
@@ -34,6 +45,7 @@
+
vvm_carrier_freedom_ca
@@ -41,6 +53,7 @@
vvm_type_omtp
vvm_freedom_ca_allows_transcription
+ mms
@@ -74,7 +87,7 @@
- vvm_type_disable
+ vvm_type_disabled
vvm_carrier_flag_27099
@@ -102,6 +115,7 @@
vvm_o2_uk_allows_transcription
+ enable_reduce_vvm_server_load_o2uk
@@ -114,7 +128,7 @@
- vvm_type_disable
+ vvm_type_disabled
vvm_carrier_flag_swisscom_ch
@@ -142,7 +156,6 @@
-
@@ -161,30 +174,19 @@
-
- vvm_carrier_flag_tracfone_usa_tmo_disable
-
-
-
-
-
-
-
-
-
- vvm_type_disable
-
-
- vvm_type_disable
+ vvm_type_disabled
vvm_carrier_flag_tracfone_usa_tmo_enable
+
+
+
@@ -234,7 +236,7 @@
- vvm_type_disable
+ vvm_type_disabled
@@ -267,7 +269,7 @@
- vvm_type_disable
+ vvm_type_disabled
vvm_carrier_flag_302220
@@ -277,7 +279,7 @@
7723
vvm_type_omtp
-
+
mms
@@ -411,6 +413,6 @@
- vvm_type_disable
+ vvm_type_disabled
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 640c2be6..8c60140c 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -1,14 +1,5 @@
LOCAL_PATH := $(call my-dir)
-# a wrapper for curl which provides wget syntax, for compatibility
-include $(CLEAR_VARS)
-LOCAL_MODULE := wget
-LOCAL_SRC_FILES := bin/wget
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-include $(BUILD_PREBUILT)
-
################################
# Copies the APN list file into $(TARGET_COPY_OUT_PRODUCT)/etc for the product as apns-conf.xml.
# In the case where $(CUSTOM_APNS_FILE) is defined, the content of $(CUSTOM_APNS_FILE)
diff --git a/prebuilt/common/bin/wget b/prebuilt/common/bin/wget
deleted file mode 100755
index 1d04de54..00000000
--- a/prebuilt/common/bin/wget
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/system/bin/sh
-# wget-curl, a curl wrapper acting as a wget drop-in replacement - version git-HEAD
-# Usage: wget [wget args] [i need to fill this in later]
-# Download all URLs given using curl, but using wget's options.
-#
-#
-# End of help.
-# Copyright (c) 2015 Kylie McClain
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# End of copyright.
-#
-
-set -o pipefail
-shopt -u shift_verbose >/dev/null 2>&1
-
-help() {
- sed -n '/^#/!d;s/^# //;s/^#//;3,${p;}' "$0" | \
- while IFS= read help_line;do
- if [[ "$help_line" == "End of help." ]];then
- exit 0
- else
- printf "%s\n" "$help_line"
- fi
- done
- exit 0
-}
-
-version() {
- sed 's/^# //;s/, .* - version / /;2q;$!d' "$0"
- copyright
- exit 0
-}
-
-copyright() {
- sed -n '/^#/!d;s/^# //;s/^#//;/End of help./,${p;}' "$0" | \
- while IFS= read copyright_line;do
- if [[ "$copyright_line" == "End of help." ]];then
- true
- elif [[ "$copyright_line" == "End of copyright." ]];then
- break
- else
- printf '%s\n' "$copyright_line"
- fi
- done
-}
-
-stderr() {
- printf "$@" >&2
-}
-
-error() {
- stderr "$0: $1\n"
- exit "$2"
-}
-
-invalid_arg() {
- error "invalid option -- '$1'" 2
-}
-
-append_opt() {
- for opt in $@;do
- CURL_OPTS="${CURL_OPTS} ${opt}"
- done
-}
-
-curl() {
- eval "command curl $@ ${CURL_RAW}"
-}
-
-append_raw_arg() {
- CURL_RAW="$CURL_RAW $@"
-}
-
-has_opt() { # exit 0 if CURL_OPTS has arg, non-zero if doesn't
- if [[ "$CURL_OPTS" == *" $1"* ]];then
- return 0
- else
- return 1
- fi
-}
-
-reexec_without() { # download afterwards without $1 in OPTS
- reexec_args_without="$reexec_args_without $@"
- reexec=1
-}
-
-reexec_only() {
- for arg in $@;do
- CURL_OPTS_REEXEC_ONLY="${CURL_OPTS_REEXEC_ONLY} $arg"
- done
-}
-
-print_url() {
- has_opt -s || printf "%s\n" "$1"
-}
-
-# 46ABDFHIKLNOPQRSTUVXabcdhiklm nH nc nd np nv opqrtvwx
-while getopts ':46ABDFHIKLNO:PQRST:U:VXa:bcdhiklmopqrtvwx' argument "$@";do
- case "$argument" in
- # a lot of these are noop right now because they are wget mirror args
- # which curl doesn't really do, and i am not sure if i should implement them
- 4) append_opt -4 ;;
- 6) append_opt -6 ;;
- A) true ;; # probably can't implement this easily...
- B) true ;;
- D) true ;;
- E) true ;;
- F) true ;; # curl doesn't care what the input is
- H) true ;;
- I) true ;;
- K) true ;;
- L) true ;;
- N) true ;;
- O) append_opt "-o $OPTARG" ;;
- P) true ;;
- Q) true ;;
- R) true ;;
- S) append_opt -I;reexec_without -I -s ;;
- T) append_opt "-m $OPTARG" ;;
- U) append_opt "--user-agent \"$OPTARG\"" ;;
- V) version; curl --version; exit 0 ;;
- X) true ;;
- a) append_raw_arg "2>&1 | tee -a $OPTARG" ;;
- b)
- wget_log="wget-log"
- i=1
- while [[ -f "${wget_log}" ]];do
- # if that exists, increment until we find something that doesn't
- i=$(($i+1))
- wget_log="wget-log.${i}"
- done
- append_raw_arg ">\"$wget_log\" 2>&1 &"
- printf "Continuing in background, pid %s.\nOutput will be written to '$wget_log'.\n" "$$"
- ;;
- c) append_opt "-C -" ;;
- d) append_opt "-v" ;;
- e) true ;;
- h) help ;;
- i)
- [[ ! -f "$OPTARG" ]] && error "$OPTARG does not exist" 3
- for url in $(<"$OPTARG");do
- URLS=( ${URLS[@]} "$url" )
- done
- ;;
- q) append_opt "-s" ;;
- esac
- shift $(($OPTIND-1))
-done
-
-# set wget default equivilants
-append_opt -L # follow redirects
-append_opt -# # progress bar
-
-if [[ -z "${URLS[@]}" ]];then
- URLS=( ${@} )
-fi
-
-for url in ${URLS[@]};do
- url_file=${url##*/}
- if [[ "$url" == "$url_file" ]];then
- # has no remote file name and -o is not in CURL_OPTS... assume index.html
- has_opt -o || append_opt "-o index.html"
- fi
-
- eval "print_url '$url';curl ${CURL_OPTS} -- $url"
- if [[ "$reexec" ]];then
- for reexec_arg in ${reexec_args_without};do
- CURL_OPTS_REEXEC=$(echo "${CURL_OPTS_REEXEC:-$CURL_OPTS}" | sed "s# $reexec_arg##")
- done
- eval "print_url '$url';curl ${CURL_OPTS_REEXEC} ${CURL_OPTS_REEXEC_ONLY} -- $url"
- fi
-done
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index c3c39048..33d1d0c3 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -2,6 +2,7 @@
+
@@ -50,7 +52,7 @@
-
+
@@ -69,18 +71,18 @@
-
-
+
+
-
+
-
-
+
+
@@ -123,15 +125,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -148,7 +150,7 @@
-
+
@@ -160,20 +162,20 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -240,7 +242,7 @@
-
+
@@ -329,7 +331,7 @@
-
+
@@ -407,8 +409,8 @@
-
-
+
+
@@ -556,7 +558,7 @@
-
+
@@ -723,7 +725,7 @@
-
+
@@ -743,14 +745,12 @@
-
-
-
-
+
+
-
+
@@ -801,8 +801,8 @@
-
-
+
+
@@ -1190,9 +1190,9 @@
-
+
-
+
@@ -1200,9 +1200,9 @@
-
+
-
+
@@ -3213,6 +3213,7 @@
+
@@ -3220,7 +3221,7 @@
-
+
diff --git a/prebuilt/common/etc/init/lineage-radio.rc b/prebuilt/common/etc/init/lineage-radio.rc
deleted file mode 100644
index 22f1e64d..00000000
--- a/prebuilt/common/etc/init/lineage-radio.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Disable ril services if noril prop is set
-on property:ro.radio.noril=1
- stop ims_rtp_daemon
- stop imsdatadaemon
- stop imsqmidaemon
- stop imsrcsservice
- stop ril-daemon
- stop qmuxd
- stop netmgrd
-
-on property:persist.radio.noril=1
- setprop ro.radio.noril 1
diff --git a/product/nvidia.mk b/product/nvidia.mk
new file mode 100644
index 00000000..5ae815d0
--- /dev/null
+++ b/product/nvidia.mk
@@ -0,0 +1,18 @@
+# Copyright (C) 2019 The LineageOS 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.
+
+# Baseline Nvidia framework enhancements
+# Includes support for:
+# 1) NvCPL / Application Profiles
+NV_ANDROID_FRAMEWORK_ENHANCEMENTS := true