Merge "Use non-next NetworkStack" into tm-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fede388..cce80b5 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,7 @@
# 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
include $(BUILD_SYSTEM)/version_util.mk
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index bc054cc..998327e 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -54,7 +54,6 @@
com.android.appsearch \
com.android.bluetooth \
com.android.conscrypt \
- com.android.cronet \
com.android.extservices \
com.android.i18n \
com.android.ipsec \
diff --git a/target/product/gsi/33.txt b/target/product/gsi/33.txt
index 22a2547..03a143d 100644
--- a/target/product/gsi/33.txt
+++ b/target/product/gsi/33.txt
@@ -62,7 +62,7 @@
VNDK-core: android.hardware.audio.common@2.0.so
VNDK-core: android.hardware.authsecret-V1-ndk.so
VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
-VNDK-core: android.hardware.bluetooth.audio-V1-ndk.so
+VNDK-core: android.hardware.bluetooth.audio-V2-ndk.so
VNDK-core: android.hardware.camera.common-V1-ndk.so
VNDK-core: android.hardware.camera.device-V1-ndk.so
VNDK-core: android.hardware.camera.metadata-V1-ndk.so
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 22a2547..03a143d 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -62,7 +62,7 @@
VNDK-core: android.hardware.audio.common@2.0.so
VNDK-core: android.hardware.authsecret-V1-ndk.so
VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
-VNDK-core: android.hardware.bluetooth.audio-V1-ndk.so
+VNDK-core: android.hardware.bluetooth.audio-V2-ndk.so
VNDK-core: android.hardware.camera.common-V1-ndk.so
VNDK-core: android.hardware.camera.device-V1-ndk.so
VNDK-core: android.hardware.camera.metadata-V1-ndk.so
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 522d489..d1b9358 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1068,10 +1068,11 @@
pre_partition_state, post_partition_state):
assert pre_partition_state is not None
partition_timestamps = {}
- for part in pre_partition_state:
- partition_timestamps[part.partition_name] = part.version
for part in post_partition_state:
- partition_timestamps[part.partition_name] = \
+ partition_timestamps[part.partition_name] = part.version
+ for part in pre_partition_state:
+ if part.partition_name in partition_timestamps:
+ partition_timestamps[part.partition_name] = \
max(part.version, partition_timestamps[part.partition_name])
return [
"--partition_timestamps",