Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3159fa2d authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Android (Google) Code Review
Browse files

Merge "Make restoreSome API be @SystemAPI"

parents 3fbeb923 473bf697

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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 {

core/java/android/app/backup/RestoreSession.java

+0 −4
Original line number Diff line number Diff line
@@ -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);