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

Commit 142aae9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update test for Truth8 deprecation." into main am: c036a668 am: 717f8921 

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



Change-Id: I760bcfe2192777c5cbaf1632f41c1bb1588824e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebefe4f8 717f8921

services/tests/RemoteProvisioningServiceTests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ android_test { 
        "service-rkp.impl",

        "services.core",

        "truth",

        "truth-java8-extension",

    ],

    test_suites: [

        "device-tests",

services/tests/RemoteProvisioningServiceTests/src/com/android/server/security/rkp/RemoteProvisioningShellCommandTest.java

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.security.rkp;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth8.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;