Merge 6a9fe1a0a78c54b262f67d97f8b073cab295af45 on remote branch

Change-Id: I4345ba696215eb74e9ad4f32569a2c889079f802

7 files changed, 22 insertions, 10 deletions

diff --git a/core/build_id.mk b/core/build_id.mk
index 9335afdf0e..8727d77a83 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=SKQ1.211230.001
+BUILD_ID=SKQ1.220119.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cf3fce678c..5da8f7f214 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -246,7 +246,7 @@ ifndef PLATFORM_SECURITY_PATCH
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2021-12-05
+      PLATFORM_SECURITY_PATCH := 2022-01-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 95a004bb52..c90b8afe62 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -119,7 +119,6 @@ PRODUCT_PACKAGES += \
     ip-up-vpn \
     javax.obex \
     keystore2 \
-		credstore \
     ld.mc \
     libaaudio \
     libalarm_jni \
@@ -195,7 +194,6 @@ PRODUCT_PACKAGES += \
     libwilhelm \
     linker \
     linkerconfig \
-    llkd \
     lmkd \
     LocalTransport \
     locksettings \
@@ -284,6 +282,7 @@ PRODUCT_PACKAGES += \
 ifneq ($(TARGET_HAS_LOW_RAM), true)
 PRODUCT_PACKAGES += \
     credstore \
+    llkd \
     SecureElement
 endif
 
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 2176672aa8..a7f3ebb6fe 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -32,9 +32,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     LiveWallpapersPicker \
     PartnerBookmarksProvider \
-    Stk \
     Tag \
 
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
+    Stk
+endif #TARGET_NO_TELEPHONY
+
 # OTA support
 PRODUCT_PACKAGES += \
     recovery-refresh \
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 36723d81aa..0392f3f958 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \
     KeyChain \
     librs_jni \
     ManagedProvisioning \
-    MmsService \
     MtpService \
     MusicFX \
     PacProcessor \
@@ -64,13 +63,17 @@ PRODUCT_PACKAGES += \
     SharedStorageBackup \
     SimAppDialog \
     Telecom \
-    TelephonyProvider \
-    TeleService \
     Traceur \
     UserDictionaryProvider \
     VpnDialogs \
     vr \
 
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
+  MmsService \
+  TelephonyProvider \
+  TeleService
+endif #TARGET_NO_TELEPHONY
 
 ifneq ($(TARGET_HAS_LOW_RAM), true)
 PRODUCT_PACKAGES += \
diff --git a/target/product/telephony_product.mk b/target/product/telephony_product.mk
index 18374d4b23..5b2709c7b0 100644
--- a/target/product/telephony_product.mk
+++ b/target/product/telephony_product.mk
@@ -18,6 +18,8 @@
 # hardware, and install to the product partition.
 
 # /product packages
+ifneq ($(TARGET_NO_TELEPHONY), true)
 PRODUCT_PACKAGES += \
     Dialer \
-    ImsServiceEntitlement \
+    ImsServiceEntitlement
+endif #TARGET_NO_TELEPHONY
diff --git a/target/product/telephony_system.mk b/target/product/telephony_system.mk
index 81e7aa2701..80b6c6503a 100644
--- a/target/product/telephony_system.mk
+++ b/target/product/telephony_system.mk
@@ -21,10 +21,14 @@
 TARGET_USES_QCOM_BSP_ATEL := true
 
 PRODUCT_PACKAGES := \
+
+ifneq ($(TARGET_NO_TELEPHONY), true)
+PRODUCT_PACKAGES += \
     ONS \
     CarrierDefaultApp \
     CallLogBackup \
     com.android.cellbroadcast \
-    CellBroadcastLegacyApp \
+    CellBroadcastLegacyApp
+endif #TARGET_NO_TELEPHONY
 
 PRODUCT_COPY_FILES := \