summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruslan Tkhakokhov <rthakohov@google.com> 2018-11-19 16:49:56 +0000
committer Ruslan Tkhakokhov <rthakohov@google.com> 2018-12-10 12:13:53 +0000
commit473bf69769c3e06a6c0e75462f08f2eacb79d277 (patch)
tree6d6497056150f4dc96d634864fca148b2f8e5b48
parent348c897729fef9a4c3d2f522efea0c6946071971 (diff)
Make restoreSome API be @SystemAPI
Bug: 112292976 Test: atest RestoreSessionHostSideTest Change-Id: Ic453be3ffed43a48839b3bcaf19438d9987eb201 RestoreSession#restoreSome is used from pixelmigrate to start a systemRestore of packages selected by user, currently this needs to be done via reflection.
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/app/backup/RestoreSession.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 305bf7fc99b7..f4eb2e99b208 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -850,6 +850,8 @@ package android.app.backup {
method public int restoreAll(long, android.app.backup.RestoreObserver);
method public int restorePackage(java.lang.String, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor);
method public int restorePackage(java.lang.String, android.app.backup.RestoreObserver);
+ method public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, java.lang.String[]);
+ method public int restoreSome(long, android.app.backup.RestoreObserver, java.lang.String[]);
}
public class RestoreSet implements android.os.Parcelable {
diff --git a/core/java/android/app/backup/RestoreSession.java b/core/java/android/app/backup/RestoreSession.java
index 2e0f940331c5..79925ec2d47a 100644
--- a/core/java/android/app/backup/RestoreSession.java
+++ b/core/java/android/app/backup/RestoreSession.java
@@ -143,8 +143,6 @@ public class RestoreSession {
* @param packages The set of packages for which to attempt a restore. Regardless of
* the contents of the actual back-end dataset named by {@code token}, only
* applications mentioned in this list will have their data restored.
- *
- * @hide
*/
public int restoreSome(long token, RestoreObserver observer, BackupManagerMonitor monitor,
String[] packages) {
@@ -181,8 +179,6 @@ public class RestoreSession {
* @param packages The set of packages for which to attempt a restore. Regardless of
* the contents of the actual back-end dataset named by {@code token}, only
* applications mentioned in this list will have their data restored.
- *
- * @hide
*/
public int restoreSome(long token, RestoreObserver observer, String[] packages) {
return restoreSome(token, observer, null, packages);