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

Commit 0db9724b authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev

parents 924d482a e42c8416

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

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


package com.android.server.backup;



import android.app.backup.BackupManager;

import android.app.backup.IBackupManager;

import android.app.backup.IBackupObserver;

import android.app.backup.IBackupManagerMonitor;
@@ -361,7 +362,10 @@ public class Trampoline extends IBackupManager.Stub { 
    public int requestBackup(String[] packages, IBackupObserver observer,

            IBackupManagerMonitor monitor, int flags) throws RemoteException {

        BackupManagerService svc = mService;

        return (svc != null) ? svc.requestBackup(packages, observer, monitor, flags) : null;

        if (svc == null) {

            return BackupManager.ERROR_BACKUP_NOT_ALLOWED;

        }

        return svc.requestBackup(packages, observer, monitor, flags);

    }



    @Override