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

Commit 5e7a3489 authored by Ruslan Tkhakokhov's avatar Ruslan Tkhakokhov Committed by Automerger Merge Worker
Browse files

Merge "Clear calling identity n BackupManager#reportDelayedRestoreResult" into... 

Merge "Clear calling identity n BackupManager#reportDelayedRestoreResult" into udc-dev am: 22480bc5

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



Change-Id: I3f84030500938fbd947bc99d343b14dbc7949fdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58d5bb00 22480bc5

services/backup/java/com/android/server/backup/BackupManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -1619,7 +1619,14 @@ public class BackupManagerService extends IBackupManager.Stub { 
                        /* caller */ "reportDelayedRestoreResult()");



        if (userBackupManagerService != null) {

            // Clear as the method binds to BackupTransport, which needs to happen from system

            // process.

            final long oldId = Binder.clearCallingIdentity();

            try {

                userBackupManagerService.reportDelayedRestoreResult(packageName, results);

            } finally {

                Binder.restoreCallingIdentity(oldId);

            }

        }

    }