From 8f559e099d3263de0ab265a301c7d52f964e7055 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 12 May 2022 13:17:02 +0900 Subject: [PATCH 1/2] Use non-next NetworkStack NetworkStack now builds against stable T APIs, so T can use the stable binaries instead of the "next" versions. Since it has just been bumped, NetworkStack is equivalent to NetworkStackNext at this point, so this is a no-op. This change should not go into development branches using unstable SDKs (including aosp/master downstreams), as per the merged-in. Bug: 216396304 Test: m Merged-In: I12348bd913f724c4675177ce6cdf582948d9d03c Change-Id: I8788c5af37c862e9a74cc140d1dc917fb15ec5a9 --- target/product/base_system.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 83ca2248ae..bc054cc495 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -225,7 +225,7 @@ PRODUCT_PACKAGES += \ mtpd \ ndc \ netd \ - NetworkStackNext \ + NetworkStack \ odsign \ org.apache.http.legacy \ otacerts \ From e359b9008240897e5dcf0fe233e93dbed9560d4b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 12 May 2022 18:49:12 +0000 Subject: [PATCH 2/2] Update Security String to 2022-07-05 Bug: 231380374 Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 0daae6bdcb..731d4989ee 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,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 := 2022-06-05 + PLATFORM_SECURITY_PATCH := 2022-07-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH