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

Commit b06bf4ac authored by Chris Baron's avatar Chris Baron Committed by Automerger Merge Worker
Browse files

Merge "Remove flakyness in BugreportManagerServiceImplTest." into udc-qpr-dev am: 5dbdd4a2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24445352



Change-Id: I6495143f0c2c9d399a1c41386b7128657c842109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41d234af 5dbdd4a2

services/tests/servicestests/src/com/android/server/os/BugreportManagerServiceImplTest.java

+33 −8
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.util.Pair; 
import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -68,6 +69,27 @@ public class BugreportManagerServiceImplTest { 
        mBugreportFileManager = new BugreportManagerServiceImpl.BugreportFileManager();

    }



    @After

    public void tearDown() throws Exception {

        // Changes to RoleManager persist between tests, so we need to clear out any funny

        // business we did in previous tests.

        RoleManager roleManager = mContext.getSystemService(RoleManager.class);

        CallbackFuture future = new CallbackFuture();

        runWithShellPermissionIdentity(

                () -> {

                    roleManager.setBypassingRoleQualification(false);

                    roleManager.removeRoleHolderAsUser(

                            "android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION",

                            mContext.getPackageName(),

                            /* flags= */ 0,

                            Process.myUserHandle(),

                            mContext.getMainExecutor(),

                            future);

                });



        assertThat(future.get()).isEqualTo(true);

    }



    @Test

    public void testBugreportFileManagerFileExists() {

        Pair<Integer, String> callingInfo = new Pair<>(mCallingUid, mCallingPackage);
@@ -131,14 +153,17 @@ public class BugreportManagerServiceImplTest { 
                new BugreportManagerServiceImpl.Injector(mContext, new ArraySet<>()));

        RoleManager roleManager = mContext.getSystemService(RoleManager.class);

        CallbackFuture future = new CallbackFuture();

        runWithShellPermissionIdentity(() -> roleManager.setBypassingRoleQualification(true));

        runWithShellPermissionIdentity(() -> roleManager.addRoleHolderAsUser(

        runWithShellPermissionIdentity(

                () -> {

                    roleManager.setBypassingRoleQualification(true);

                    roleManager.addRoleHolderAsUser(

                            "android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION",

                            mContext.getPackageName(),

                            /* flags= */ 0,

                            Process.myUserHandle(),

                            mContext.getMainExecutor(),

                future));

                            future);

                });



        assertThat(future.get()).isEqualTo(true);

        mService.cancelBugreport(Binder.getCallingUid(), mContext.getPackageName());