Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make restoreSome API be @SystemAPI"

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2018-12-10 16:38:07 +00:00
committed by Android (Google) Code Review
parent 3fbeb923af 473bf69769
commit 3159fa2df8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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 {

4
core/java/android/app/backup/RestoreSession.java
View File

@@ -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);