commit 1b6f515550969020f0622afb7f82b24d7150c3c1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 09 00:29:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 09 00:29:19 2018 +0000
tree 83590c5b6e6022a575475008c088a074379101d9
parent f774a706a07f3ac67558f299f6c0ddeb577c5b14
parent eac4e64bc44a608972a1e7d7a81a026137bdbc87

Merge "Temporary fix to prevent breakage with new API."

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b958165..6a6d667 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -361,6 +361,7 @@
   }
 
   public final class StatsManager {
+    method public boolean addConfiguration(long, byte[], java.lang.String, java.lang.String);
     method public boolean addConfiguration(long, byte[]);
     method public byte[] getData(long);
     method public byte[] getMetadata();

core/java/android/app/StatsManager.java

diff --git a/core/java/android/app/StatsManager.java b/core/java/android/app/StatsManager.java
index 88e42d5..86949ca 100644
--- a/core/java/android/app/StatsManager.java
+++ b/core/java/android/app/StatsManager.java
@@ -74,6 +74,14 @@
     }
 
     /**
+     * Temporary. Will be deleted.
+     */
+    @RequiresPermission(Manifest.permission.DUMP)
+    public boolean addConfiguration(long configKey, byte[] config, String a, String b) {
+        return addConfiguration(configKey, config);
+    }
+
+    /**
      * Clients can send a configuration and simultaneously registers the name of a broadcast
      * receiver that listens for when it should request data.
      *