From 4f8f0d9d5bb90a8a388a12787aac1f6c84c8a615 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 23 Mar 2020 17:47:18 +0000 Subject: [PATCH] Fix statsd publicapi stub default usage It was referring to the systemapi defaults, which is incorrect. I noticed this as I was adding all the stub txt variants to dist. Bug: 147768409 Test: m Change-Id: If12fe22c92fbfc82a6efce9c466990d9c3da242e --- apex/statsd/framework/Android.bp | 2 +- apex/statsd/framework/api/current.txt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp index 804eb030e7959..7480ec8345964 100644 --- a/apex/statsd/framework/Android.bp +++ b/apex/statsd/framework/Android.bp @@ -89,7 +89,7 @@ stubs_defaults { droidstubs { name: "framework-statsd-stubs-srcs-publicapi", defaults: [ - "framework-module-stubs-defaults-systemapi", + "framework-module-stubs-defaults-publicapi", "framework-statsd-stubs-srcs-defaults", ], } diff --git a/apex/statsd/framework/api/current.txt b/apex/statsd/framework/api/current.txt index d802177e249b3..a65569347e7d3 100644 --- a/apex/statsd/framework/api/current.txt +++ b/apex/statsd/framework/api/current.txt @@ -1 +1,12 @@ // Signature format: 2.0 +package android.util { + + public final class StatsLog { + method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public static boolean logBinaryPushStateChanged(@NonNull String, long, int, int, @NonNull long[]); + method public static boolean logEvent(int); + method public static boolean logStart(int); + method public static boolean logStop(int); + } + +} +