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

Commit f3b8c6fe authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Android (Google) Code Review
Browse files

Merge "[KV] State machine to linear task w/ RemoteCall"

parents fc0bcae4 2d87f453

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ java_library { 
        "core/java/android/app/trust/IStrongAuthTracker.aidl",

        "core/java/android/app/trust/ITrustManager.aidl",

        "core/java/android/app/trust/ITrustListener.aidl",

        "core/java/android/app/backup/IBackupCallback.aidl",

        "core/java/android/app/backup/IBackupManager.aidl",

        "core/java/android/app/backup/IBackupObserver.aidl",

        "core/java/android/app/backup/IBackupManagerMonitor.aidl",

core/java/android/app/IBackupAgent.aidl

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app;



import android.app.backup.IBackupCallback;

import android.app.backup.IBackupManager;

import android.os.ParcelFileDescriptor;
@@ -55,7 +56,7 @@ oneway interface IBackupAgent { 
    void doBackup(in ParcelFileDescriptor oldState,

            in ParcelFileDescriptor data,

            in ParcelFileDescriptor newState,

            long quotaBytes, int token, IBackupManager callbackBinder, int transportFlags);

            long quotaBytes, IBackupCallback callbackBinder, int transportFlags);



    /**

     * Restore an entire data snapshot to the application.

core/java/android/app/backup/BackupAgent.java

+6 −4
Original line number Diff line number Diff line
@@ -941,11 +941,13 @@ public abstract class BackupAgent extends ContextWrapper { 
        private static final String TAG = "BackupServiceBinder";



        @Override

        public void doBackup(ParcelFileDescriptor oldState,

        public void doBackup(

                ParcelFileDescriptor oldState,

                ParcelFileDescriptor data,

                ParcelFileDescriptor newState,

                long quotaBytes, int token, IBackupManager callbackBinder, int transportFlags)

                throws RemoteException {

                long quotaBytes,

                IBackupCallback callbackBinder,

                int transportFlags) throws RemoteException {

            // Ensure that we're running with the app's normal permission level

            long ident = Binder.clearCallingIdentity();
@@ -969,7 +971,7 @@ public abstract class BackupAgent extends ContextWrapper { 


                Binder.restoreCallingIdentity(ident);

                try {

                    callbackBinder.opComplete(token, 0);

                    callbackBinder.operationComplete(0);

                } catch (RemoteException e) {

                    // we'll time out anyway, so we're safe

                }

core/java/android/app/backup/IBackupCallback.aidl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2018, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app.backup;



import android.app.backup.IBackupManager;

import android.os.ParcelFileDescriptor;



/**

 * Callback interface made for responding to one-way calls from the system.

 *

 * @hide

 */

oneway interface IBackupCallback {

    void operationComplete(long result);

}

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

+11 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT 


import android.app.ApplicationThreadConstants;

import android.app.IBackupAgent;

import android.app.backup.IBackupCallback;

import android.app.backup.FullBackup;

import android.app.backup.FullBackupDataOutput;

import android.content.pm.ApplicationInfo;
@@ -20,6 +21,7 @@ import android.os.SELinux; 
import android.util.Slog;



import com.android.internal.util.Preconditions;

import com.android.server.backup.remote.ServiceBackupCallback;

import com.android.server.backup.utils.FullBackupUtils;



import libcore.io.IoUtils;
@@ -158,10 +160,17 @@ public class KeyValueAdbBackupEngine { 
            mBackupManagerService.prepareOperationTimeout(token, kvBackupAgentTimeoutMillis, null,

                    OP_TYPE_BACKUP_WAIT);



            IBackupCallback callback =

                    new ServiceBackupCallback(

                            mBackupManagerService.getBackupManagerBinder(), token);

            // Start backup and wait for BackupManagerService to get callback for success or timeout

            agent.doBackup(

                    mSavedState, mBackupData, mNewState, Long.MAX_VALUE, token,

                    mBackupManagerService.getBackupManagerBinder(), /*transportFlags=*/ 0);

                    mSavedState,

                    mBackupData,

                    mNewState,

                    /* quotaBytes */ Long.MAX_VALUE,

                    callback,

                    /* transportFlags */ 0);

            if (!mBackupManagerService.waitUntilOperationComplete(token)) {

                Slog.e(TAG, "Key-value backup failed on package " + packageName);

                return false;