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

Commit 8b20b2c2 authored by Tony Mak's avatar Tony Mak
Browse files

selectBackupTransportAsync should report failure when backup is disabled 

Fix: 37304539
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
Test: setup device owner, then set up profile.
      Ensure tapping Settings->Google->Work->Security -> Verify app
      is working

Change-Id: I393308857ea6082dca167e3e417b946615a83c20
parent eff8ed36

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

+2 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ public class Trampoline extends IBackupManager.Stub { 
        BackupManagerServiceInterface svc = mService;

        if (svc != null) {

            svc.selectBackupTransportAsync(transport, listener);

        } else {

            listener.onFailure(BackupManager.ERROR_BACKUP_NOT_ALLOWED);

        }

    }

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

+28 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.backup; 


import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.assertNull;

import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.fail;
@@ -31,6 +32,7 @@ import android.app.backup.BackupManager; 
import android.app.backup.IBackupManagerMonitor;

import android.app.backup.IBackupObserver;

import android.app.backup.IFullBackupRestoreObserver;

import android.app.backup.ISelectBackupTransportCallback;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -54,6 +56,9 @@ import java.io.File; 
import java.io.FileDescriptor;

import java.io.IOException;

import java.io.PrintWriter;

import java.util.concurrent.LinkedBlockingDeque;

import java.util.concurrent.LinkedBlockingQueue;

import java.util.concurrent.TimeUnit;



@SmallTest

@Presubmit
@@ -568,9 +573,30 @@ public class TrampolineTest { 
    }



    @Test

    public void selectBackupTransportAsync_calledBeforeInitialize_ignored() throws RemoteException {

        mTrampoline.selectBackupTransportAsync(TRANSPORT_COMPONENT_NAME, null);

    public void selectBackupTransportAsync_calledBeforeInitialize_ignored() throws Exception {

        LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue();

        mTrampoline.selectBackupTransportAsync(

                TRANSPORT_COMPONENT_NAME,

                new ISelectBackupTransportCallback() {

                    @Override

                    public void onSuccess(String transportName) throws RemoteException {



                    }



                    @Override

                    public void onFailure(int reason) throws RemoteException {

                        q.offer(reason);

                    }



                    @Override

                    public IBinder asBinder() {

                        return null;

                    }

                });

        verifyNoMoreInteractions(mBackupManagerServiceMock);

        Integer errorCode = q.poll(5, TimeUnit.SECONDS);

        assertNotNull(errorCode);

        assertEquals(BackupManager.ERROR_BACKUP_NOT_ALLOWED, (int) errorCode);

    }



    @Test