Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove flakyness in BugreportManagerServiceImplTest." into udc-qpr-dev

Browse Source
This commit is contained in:
Chris Baron
2023-08-21 15:58:48 +00:00
committed by Android (Google) Code Review
parent 5d425594bb b5c54ae01c
commit 5dbdd4a222
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(
"android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION",
mContext.getPackageName(),
/* flags= */ 0,
Process.myUserHandle(),
mContext.getMainExecutor(),
future));
runWithShellPermissionIdentity(
() -> {
roleManager.setBypassingRoleQualification(true);
roleManager.addRoleHolderAsUser(
"android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION",
mContext.getPackageName(),
/* flags= */ 0,
Process.myUserHandle(),
mContext.getMainExecutor(),
future);
});
assertThat(future.get()).isEqualTo(true);
mService.cancelBugreport(Binder.getCallingUid(), mContext.getPackageName());