[automerger skipped] Merge 10952656 am: 0641c69e97 -s ours am: fda41e6ef8 -s ours
am skip reason: Merged-In I0502add0f3453f32d504112fb23c60febbebf841 with SHA-1 8df4827c99 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Uwb/+/25093246
Change-Id: I93b57ac317b582959d2c72ff8dd516f760904310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index f443ec1..4017238 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1007601"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.uwb/sdk/uwb-module-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.uwb/sdk/uwb-module-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Uwb"
- git_branch: "udc-d1-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 3d48c46..df41b59 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1007188"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.uwb/sdk/uwb-module-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_go_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.uwb/sdk/uwb-module-sdk-current.zip"
}
dest_file: "go/current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Uwb"
- git_branch: "udc-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index b943a0d..aae4e25 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -157,6 +157,7 @@
Landroid/uwb/RangingSession$Callback;->DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_BAD_PARAMETERS:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_GENERIC_ERROR:I,sdk,system-api,test-api
+Landroid/uwb/RangingSession$Callback;->REASON_INBAND_SESSION_STOP:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_INSUFFICIENT_SLOTS_PER_RR:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_LOCAL_REQUEST:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_MAX_RR_RETRY_REACHED:I,sdk,system-api,test-api
@@ -317,10 +318,10 @@
Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,sdk,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbOemExtensionCallback(Landroid/uwb/UwbManager$UwbOemExtensionCallback;)V,sdk,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 13f93e9..5331de9 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -157,6 +157,7 @@
Landroid/uwb/RangingSession$Callback;->DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_BAD_PARAMETERS:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_GENERIC_ERROR:I,system-api,test-api
+Landroid/uwb/RangingSession$Callback;->REASON_INBAND_SESSION_STOP:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_INSUFFICIENT_SLOTS_PER_RR:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_LOCAL_REQUEST:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_MAX_RR_RETRY_REACHED:I,system-api,test-api
@@ -317,10 +318,10 @@
Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbOemExtensionCallback(Landroid/uwb/UwbManager$UwbOemExtensionCallback;)V,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
diff --git a/current/sdk_library/module-lib/framework-uwb-stubs.jar b/current/sdk_library/module-lib/framework-uwb-stubs.jar
index 393ab03..eb9d66f 100644
--- a/current/sdk_library/module-lib/framework-uwb-stubs.jar
+++ b/current/sdk_library/module-lib/framework-uwb-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-uwb.srcjar b/current/sdk_library/module-lib/framework-uwb.srcjar
index cb76dee..e12f113 100644
--- a/current/sdk_library/module-lib/framework-uwb.srcjar
+++ b/current/sdk_library/module-lib/framework-uwb.srcjar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-uwb_annotations.zip b/current/sdk_library/module-lib/framework-uwb_annotations.zip
index c317b63..dd3e79a 100644
--- a/current/sdk_library/module-lib/framework-uwb_annotations.zip
+++ b/current/sdk_library/module-lib/framework-uwb_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-uwb-stubs.jar b/current/sdk_library/system/framework-uwb-stubs.jar
index be0a6c0..37b408e 100644
--- a/current/sdk_library/system/framework-uwb-stubs.jar
+++ b/current/sdk_library/system/framework-uwb-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-uwb.srcjar b/current/sdk_library/system/framework-uwb.srcjar
index 8dbd195..1a6bd46 100644
--- a/current/sdk_library/system/framework-uwb.srcjar
+++ b/current/sdk_library/system/framework-uwb.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-uwb.txt b/current/sdk_library/system/framework-uwb.txt
index 429bc34..b21f1cb 100644
--- a/current/sdk_library/system/framework-uwb.txt
+++ b/current/sdk_library/system/framework-uwb.txt
@@ -147,6 +147,7 @@
field public static final int DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE = 10; // 0xa
field public static final int REASON_BAD_PARAMETERS = 3; // 0x3
field public static final int REASON_GENERIC_ERROR = 4; // 0x4
+ field public static final int REASON_INBAND_SESSION_STOP = 16; // 0x10
field public static final int REASON_INSUFFICIENT_SLOTS_PER_RR = 14; // 0xe
field public static final int REASON_LOCAL_REQUEST = 1; // 0x1
field public static final int REASON_MAX_RR_RETRY_REACHED = 9; // 0x9
diff --git a/current/sdk_library/system/framework-uwb_annotations.zip b/current/sdk_library/system/framework-uwb_annotations.zip
index c317b63..dd3e79a 100644
--- a/current/sdk_library/system/framework-uwb_annotations.zip
+++ b/current/sdk_library/system/framework-uwb_annotations.zip
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index d33d0a0..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10917791
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index b943a0d..aae4e25 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -157,6 +157,7 @@
Landroid/uwb/RangingSession$Callback;->DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_BAD_PARAMETERS:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_GENERIC_ERROR:I,sdk,system-api,test-api
+Landroid/uwb/RangingSession$Callback;->REASON_INBAND_SESSION_STOP:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_INSUFFICIENT_SLOTS_PER_RR:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_LOCAL_REQUEST:I,sdk,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_MAX_RR_RETRY_REACHED:I,sdk,system-api,test-api
@@ -317,10 +318,10 @@
Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,sdk,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbOemExtensionCallback(Landroid/uwb/UwbManager$UwbOemExtensionCallback;)V,sdk,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 13f93e9..5331de9 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -157,6 +157,7 @@
Landroid/uwb/RangingSession$Callback;->DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_BAD_PARAMETERS:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_GENERIC_ERROR:I,system-api,test-api
+Landroid/uwb/RangingSession$Callback;->REASON_INBAND_SESSION_STOP:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_INSUFFICIENT_SLOTS_PER_RR:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_LOCAL_REQUEST:I,system-api,test-api
Landroid/uwb/RangingSession$Callback;->REASON_MAX_RR_RETRY_REACHED:I,system-api,test-api
@@ -317,10 +318,10 @@
Landroid/uwb/UwbManager;->unregisterAdapterStateCallback(Landroid/uwb/UwbManager$AdapterStateCallback;)V,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbOemExtensionCallback(Landroid/uwb/UwbManager$UwbOemExtensionCallback;)V,system-api,test-api
Landroid/uwb/UwbManager;->unregisterUwbVendorUciCallback(Landroid/uwb/UwbManager$UwbVendorUciCallback;)V,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/uwb/UwbOemExtensionCallbackListener$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/uwb/UwbVendorUciCallbackListener$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
diff --git a/go/current/sdk_library/module-lib/framework-uwb-stubs.jar b/go/current/sdk_library/module-lib/framework-uwb-stubs.jar
index 393ab03..eb9d66f 100644
--- a/go/current/sdk_library/module-lib/framework-uwb-stubs.jar
+++ b/go/current/sdk_library/module-lib/framework-uwb-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-uwb.srcjar b/go/current/sdk_library/module-lib/framework-uwb.srcjar
index cb76dee..e12f113 100644
--- a/go/current/sdk_library/module-lib/framework-uwb.srcjar
+++ b/go/current/sdk_library/module-lib/framework-uwb.srcjar
Binary files differ
diff --git a/go/current/sdk_library/module-lib/framework-uwb_annotations.zip b/go/current/sdk_library/module-lib/framework-uwb_annotations.zip
index c317b63..dd3e79a 100644
--- a/go/current/sdk_library/module-lib/framework-uwb_annotations.zip
+++ b/go/current/sdk_library/module-lib/framework-uwb_annotations.zip
Binary files differ
diff --git a/go/current/sdk_library/system/framework-uwb-stubs.jar b/go/current/sdk_library/system/framework-uwb-stubs.jar
index be0a6c0..37b408e 100644
--- a/go/current/sdk_library/system/framework-uwb-stubs.jar
+++ b/go/current/sdk_library/system/framework-uwb-stubs.jar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-uwb.srcjar b/go/current/sdk_library/system/framework-uwb.srcjar
index 8dbd195..1a6bd46 100644
--- a/go/current/sdk_library/system/framework-uwb.srcjar
+++ b/go/current/sdk_library/system/framework-uwb.srcjar
Binary files differ
diff --git a/go/current/sdk_library/system/framework-uwb.txt b/go/current/sdk_library/system/framework-uwb.txt
index 429bc34..b21f1cb 100644
--- a/go/current/sdk_library/system/framework-uwb.txt
+++ b/go/current/sdk_library/system/framework-uwb.txt
@@ -147,6 +147,7 @@
field public static final int DATA_FAILURE_REASON_DATA_SIZE_TOO_LARGE = 10; // 0xa
field public static final int REASON_BAD_PARAMETERS = 3; // 0x3
field public static final int REASON_GENERIC_ERROR = 4; // 0x4
+ field public static final int REASON_INBAND_SESSION_STOP = 16; // 0x10
field public static final int REASON_INSUFFICIENT_SLOTS_PER_RR = 14; // 0xe
field public static final int REASON_LOCAL_REQUEST = 1; // 0x1
field public static final int REASON_MAX_RR_RETRY_REACHED = 9; // 0x9
diff --git a/go/current/sdk_library/system/framework-uwb_annotations.zip b/go/current/sdk_library/system/framework-uwb_annotations.zip
index c317b63..dd3e79a 100644
--- a/go/current/sdk_library/system/framework-uwb_annotations.zip
+++ b/go/current/sdk_library/system/framework-uwb_annotations.zip
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..fffc196 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10917791
\ No newline at end of file
