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

Commit f3d39e59 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I30dfeadc,I186cf812 

* changes:
  Fix and enable test for Trampoline.requestBackup().
  Fix potential NPE in Trampoline.requestBackup().
parents 5ab079f4 c92eb465

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;
@@ -396,7 +397,10 @@ public class Trampoline extends IBackupManager.Stub { 
    public int requestBackup(String[] packages, IBackupObserver observer,

            IBackupManagerMonitor monitor, int flags) throws RemoteException {

        BackupManagerServiceInterface 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

services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java

+3 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; 
import static org.mockito.Mockito.when;



import android.app.Instrumentation;

import android.app.backup.BackupManager;

import android.app.backup.IBackupManagerMonitor;

import android.app.backup.IBackupObserver;

import android.app.backup.IFullBackupRestoreObserver;
@@ -567,12 +568,10 @@ public class TrampolineTest { 
        verify(mBackupManagerServiceMock).isAppEligibleForBackup(PACKAGE_NAME);

    }



    // Test is ignored until Trampoline.requestBackup() is fixed not to throw NPE.

    @Ignore

    @Test

    public void requestBackup_calledBeforeInitialize_ignored() throws RemoteException {

        assertEquals(0, mTrampoline.requestBackup(PACKAGE_NAMES, mBackupObserverMock,

                mBackupManagerMonitorMock, 123));

        assertEquals(BackupManager.ERROR_BACKUP_NOT_ALLOWED, mTrampoline.requestBackup(

                PACKAGE_NAMES, mBackupObserverMock, mBackupManagerMonitorMock, 123));

        verifyNoMoreInteractions(mBackupManagerServiceMock);

    }