summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-06 08:21:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-06 08:21:24 +0000
commit9d9d3e56ce98d216dedbbbd35c71ceac74246300 (patch)
tree545699e190adf6963d3646c5a44d17715ad32b5d
parent6cab47b9d8b089f9f355b851b125421a06d351dd (diff)
parent371e33d92cc214580bc045b4285ef7fb1c41f854 (diff)
downloadStatsD-9d9d3e56ce98d216dedbbbd35c71ceac74246300.tar.gz
Snap for 8153205 from 371e33d92cc214580bc045b4285ef7fb1c41f854 to mainline-mediaprovider-release
Change-Id: Id28d22ea3d214961d16a55a1f79b7a66bd235547
-rw-r--r--framework/java/android/util/StatsEvent.java20
-rw-r--r--lib/libstatspull/Android.bp4
2 files changed, 18 insertions, 6 deletions
diff --git a/framework/java/android/util/StatsEvent.java b/framework/java/android/util/StatsEvent.java
index a1988b8c..51676f95 100644
--- a/framework/java/android/util/StatsEvent.java
+++ b/framework/java/android/util/StatsEvent.java
@@ -586,7 +586,9 @@ public final class StatsEvent {
/**
* Write a repeated boolean field to this StatsEvent.
*
- * The list size must not exceed 127.
+ * The list size must not exceed 127. Otherwise, the array isn't written
+ * to the StatsEvent and ERROR_LIST_TOO_LONG is appended to the
+ * StatsEvent errors field.
*
* @param elements array of booleans.
**/
@@ -607,7 +609,9 @@ public final class StatsEvent {
/**
* Write a repeated int field to this StatsEvent.
*
- * The list size must not exceed 127.
+ * The list size must not exceed 127. Otherwise, the array isn't written
+ * to the StatsEvent and ERROR_LIST_TOO_LONG is appended to the
+ * StatsEvent errors field.
*
* @param elements array of ints.
**/
@@ -628,7 +632,9 @@ public final class StatsEvent {
/**
* Write a repeated long field to this StatsEvent.
*
- * The list size must not exceed 127.
+ * The list size must not exceed 127. Otherwise, the array isn't written
+ * to the StatsEvent and ERROR_LIST_TOO_LONG is appended to the
+ * StatsEvent errors field.
*
* @param elements array of longs.
**/
@@ -649,7 +655,9 @@ public final class StatsEvent {
/**
* Write a repeated float field to this StatsEvent.
*
- * The list size must not exceed 127.
+ * The list size must not exceed 127. Otherwise, the array isn't written
+ * to the StatsEvent and ERROR_LIST_TOO_LONG is appended to the
+ * StatsEvent errors field.
*
* @param elements array of floats.
**/
@@ -670,7 +678,9 @@ public final class StatsEvent {
/**
* Write a repeated string field to this StatsEvent.
*
- * The list size must not exceed 127.
+ * The list size must not exceed 127. Otherwise, the array isn't written
+ * to the StatsEvent and ERROR_LIST_TOO_LONG is appended to the
+ * StatsEvent errors field.
*
* @param elements array of strings.
**/
diff --git a/lib/libstatspull/Android.bp b/lib/libstatspull/Android.bp
index bf00942e..c0bc46d7 100644
--- a/lib/libstatspull/Android.bp
+++ b/lib/libstatspull/Android.bp
@@ -52,7 +52,6 @@ cc_library {
name: "libstatspull",
defaults: [
"libstatspull_defaults",
- "libbinder_ndk_host_user",
],
host_supported: true,
target: {
@@ -66,6 +65,9 @@ cc_library {
enabled: false,
},
},
+ darwin: {
+ enabled: false,
+ },
},
// enumerate stable entry points for APEX use
stubs: {