From 6a7fa40184220d9419936d5d8948e83cee6f0d23 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 5 Apr 2019 13:37:14 -0700 Subject: [PATCH 1/4] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 (cherry picked from commit 2db03695f4fccc312947155ae724f48885e472c5) Change-Id: Idc93d4d8b471621fbf71b74921ea2f30a0a5faad --- 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 80e5007ea..f1f60cd1a 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,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 := 2019-05-05 + PLATFORM_SECURITY_PATCH := 2019-06-01 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From ce4fc1a01c1ceefd507003dbb36f82c461d0ac58 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 12 Apr 2019 11:35:12 -0700 Subject: [PATCH 2/4] Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0314f8a3f905e5a7081556f7b4b353a (cherry picked from commit 3ae4e858b7c169b19a4994dd6b124a68fa234ff0) Change-Id: Ic2b4adbc9167abef19fc68e197669af50c36e266 --- 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 f1f60cd1a..07e6c95e9 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -231,7 +231,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 := 2019-06-01 + PLATFORM_SECURITY_PATCH := 2019-06-05 endif ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP From 91b67be5cd76d4a17f83d35aa7a7251ee8d22abd Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 16 Apr 2019 22:42:54 +0000 Subject: [PATCH 3/4] Version bump to PQ3A.190605.002 Change-Id: Icd7894296324977af62252038bc5c1c705296fbb --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b8bc0b3ca..a8ddfb0e8 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. -export BUILD_ID=PQ3A.190605.001 +export BUILD_ID=PQ3A.190605.002 From cf860f2ab2230bf26917855833435a0826b07b67 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 2 May 2019 06:22:14 +0000 Subject: [PATCH 4/4] Version bump to PQ3A.190605.003 [core/build_id.mk] Change-Id: I47c6e50b2544d1505bf9d7eacec57eb3dbc266ee --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a8ddfb0e8..6d0e827d7 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. -export BUILD_ID=PQ3A.190605.002 +export BUILD_ID=PQ3A.190605.003