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

Commit 11037fec authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Address API feedback for BackupManager#reportDelayedRestoreResult" into... 

Merge "Address API feedback for BackupManager#reportDelayedRestoreResult" into udc-dev am: 02bbfca8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609425



Change-Id: I8e6977d8c2b7ee068530f82e8323dce7e6a998da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2509e292 02bbfca8

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ package android.app.backup { 
    method @RequiresPermission(android.Manifest.permission.BACKUP) public boolean isBackupEnabled();

    method @RequiresPermission(android.Manifest.permission.BACKUP) public boolean isBackupServiceActive(android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.BACKUP) public String[] listAllTransports();

    method @NonNull public void reportDelayedRestoreResult(@NonNull android.app.backup.BackupRestoreEventLogger);

    method public void reportDelayedRestoreResult(@NonNull android.app.backup.BackupRestoreEventLogger);

    method @RequiresPermission(android.Manifest.permission.BACKUP) public int requestBackup(String[], android.app.backup.BackupObserver);

    method @RequiresPermission(android.Manifest.permission.BACKUP) public int requestBackup(String[], android.app.backup.BackupObserver, android.app.backup.BackupManagerMonitor, int);

    method @Deprecated public int requestRestore(android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor);

core/java/android/app/backup/BackupManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,6 @@ public class BackupManager { 
     *

     * @hide

     */

    @NonNull

    @SystemApi

    public void reportDelayedRestoreResult(@NonNull BackupRestoreEventLogger logger) {

        checkServiceBinder();