From 5914fa00027fa963b5b59e809bad772dff3da06d Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 16 Jan 2018 16:38:42 -0800 Subject: [PATCH] Adds old API to StatsManager (temporary need). We changed the API to use long-based config keys instead of strings, but we have some code that depends on the old API. Let's add them back temporarily. The old API (that does nothing now) will be deleted next month. Test: N/A. Just to prevent build failures. Bug: 69522276 Change-Id: Ibc51622371d4f3ced3e9b2f66a862dea1ac1c63c --- api/system-current.txt | 3 +++ core/java/android/util/StatsManager.java | 29 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index b668c9d4e8629..762b6e89f2d0f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4647,9 +4647,12 @@ package android.util { } public final class StatsManager { + method public boolean addConfiguration(java.lang.String, byte[], java.lang.String, java.lang.String); method public boolean addConfiguration(long, byte[], java.lang.String, java.lang.String); + method public byte[] getData(java.lang.String); method public byte[] getData(long); method public byte[] getMetadata(); + method public boolean removeConfiguration(java.lang.String); method public boolean removeConfiguration(long); } diff --git a/core/java/android/util/StatsManager.java b/core/java/android/util/StatsManager.java index c25b272c11b94..e0d085cfaa66c 100644 --- a/core/java/android/util/StatsManager.java +++ b/core/java/android/util/StatsManager.java @@ -41,6 +41,16 @@ public final class StatsManager { public StatsManager() { } + /** + * Temporary to prevent build failures. Will be deleted. + */ + @RequiresPermission(Manifest.permission.DUMP) + public boolean addConfiguration(String configKey, byte[] config, String pkg, String cls) { + // To prevent breakages of dependencies on old API. + + return false; + } + /** * Clients can send a configuration and simultaneously registers the name of a broadcast * receiver that listens for when it should request data. @@ -69,6 +79,15 @@ public final class StatsManager { } } + /** + * Temporary to prevent build failures. Will be deleted. + */ + @RequiresPermission(Manifest.permission.DUMP) + public boolean removeConfiguration(String configKey) { + // To prevent breakages of old dependencies. + return false; + } + /** * Remove a configuration from logging. * @@ -92,6 +111,16 @@ public final class StatsManager { } } + /** + * Temporary to prevent build failures. Will be deleted. + */ + @RequiresPermission(Manifest.permission.DUMP) + public byte[] getData(String configKey) { + // TODO: remove this and all other methods with String-based config keys. + // To prevent build breakages of dependencies. + return null; + } + /** * Clients can request data with a binder call. This getter is destructive and also clears * the retrieved metrics from statsd memory.