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

Commit 39f03b7a authored by Steve Kondik's avatar Steve Kondik
Browse files

backupmanager: Fix compilation issue 

 * (merge with nextbit changes)

Change-Id: If91148be8025c126e9d34a263ee59801f4773e6e
parent 471f346e

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

+0 −3
Original line number Diff line number Diff line
@@ -8674,7 +8674,6 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
        }

    }



    @Override

    public void fullBackupNoninteractive(ParcelFileDescriptor fd,

            String[] domainTokens, String excludeFilesRegex, String pkg,

            boolean shouldKillAfterBackup, boolean ignoreEncryptionPasswordCheck,
@@ -8697,7 +8696,6 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
        mBackupHandler.sendMessage(msg);

    }



    @Override

    public void fullRestoreNoninteractive(ParcelFileDescriptor fd,

            boolean ignoreEncryptionPasswordCheck, IFullBackupRestoreObserver observer) {

        mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
@@ -8713,7 +8711,6 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
    }



    // Enable/disable the backup service

    @Override

    public void setBackupEnabled(boolean enable) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,

                "setBackupEnabled");

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

+21 −0
Original line number Diff line number Diff line
@@ -232,6 +232,27 @@ public class Trampoline extends IBackupManager.Stub { 
        }

    }



    @Override

    public void fullBackupNoninteractive(ParcelFileDescriptor fd,

            String[] domainTokens, String excludeFilesRegex, String pkg,

            boolean shouldKillAfterBackup, boolean ignoreEncryptionPasswordCheck,

            IFullBackupRestoreObserver observer) {

        BackupManagerService svc = mService;

        if (svc != null) {

            svc.fullBackupNoninteractive(fd, domainTokens, excludeFilesRegex, pkg,

                    shouldKillAfterBackup, ignoreEncryptionPasswordCheck, observer);

        }

    }



    @Override

    public void fullRestoreNoninteractive(ParcelFileDescriptor fd,

            boolean ignoreEncryptionPasswordCheck, IFullBackupRestoreObserver observer) {

        BackupManagerService svc = mService;

        if (svc != null) {

            svc.fullRestoreNoninteractive(fd, ignoreEncryptionPasswordCheck, observer);

        }

    }



    @Override

    public void fullTransportBackup(String[] packageNames) throws RemoteException {

        BackupManagerService svc = mService;