Merge "Tests for libstatspull"
diff --git a/apex/framework/java/android/app/StatsManager.java b/apex/framework/java/android/app/StatsManager.java
index ad1ac95..a1de330 100644
--- a/apex/framework/java/android/app/StatsManager.java
+++ b/apex/framework/java/android/app/StatsManager.java
@@ -474,17 +474,6 @@
}
/**
- * Temp registration for while the migration is in progress.
- *
- * @hide
- */
- public void registerPullAtomCallback(int atomTag, @Nullable PullAtomMetadata metadata,
- @NonNull StatsPullAtomCallback callback,
- @NonNull @CallbackExecutor Executor executor) {
- registerPullAtomCallback(atomTag, metadata, executor, callback);
- }
-
- /**
* Registers a callback for an atom when that atom is to be pulled. The stats service will
* invoke pullData in the callback when the stats service determines that this atom needs to be
* pulled.
@@ -591,15 +580,6 @@
}
/**
- * Temp for while migrations are in progress.
- *
- * @hide
- */
- public static PullAtomMetadata.Builder newBuilder() {
- return new PullAtomMetadata.Builder();
- }
-
- /**
* Builder for PullAtomMetadata.
*/
public static class Builder {