Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Ie9cb62e9b71ce574c5d69c9462f98244b8e0e3ef
Change-Id: Id9ea7e43942e9ffd0561385639d3a764363c595b
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 95155df..c4f2ab0 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -41,3 +41,7 @@
Landroid/devicelock/ILockUnlockDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/devicelock/ILockUnlockDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/devicelock/ILockUnlockDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/devicelock/ParcelableException$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/devicelock/ParcelableException$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/devicelock/ParcelableException;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/devicelock/ParcelableException;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index f7c0fa9..c373bfd 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -41,3 +41,7 @@
Landroid/devicelock/ILockUnlockDeviceCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/devicelock/ILockUnlockDeviceCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/devicelock/ILockUnlockDeviceCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/devicelock/ParcelableException$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/devicelock/ParcelableException$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/devicelock/ParcelableException;->describeContents()I,public-api,system-api,test-api
+Landroid/devicelock/ParcelableException;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index c00ebca..e235cbe 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10860864
\ No newline at end of file
+11292046
\ No newline at end of file
