diff options
| author | 2024-01-10 00:43:27 +0000 | |
|---|---|---|
| committer | 2024-01-10 00:43:27 +0000 | |
| commit | 3f74606632f3faaf4cddadf1782d5d9af4f42ff4 (patch) | |
| tree | d7390ae99ed37a2f790168c6c8ae7193c72f144f | |
| parent | ea9ea024510800a144ffc410667b0149c2d0d75f (diff) | |
| parent | 9e1a2d7e7956b84b04246d4d69a5c3d0045100b7 (diff) | |
Merge "Explicitly set SetFlagsRule with NULL_DEFAULT" into main
| -rw-r--r-- | core/tests/coretests/src/android/os/BuildTest.java | 3 | ||||
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/os/BuildTest.java b/core/tests/coretests/src/android/os/BuildTest.java index 3162e6da15c5..2d3e12331e23 100644 --- a/core/tests/coretests/src/android/os/BuildTest.java +++ b/core/tests/coretests/src/android/os/BuildTest.java @@ -45,7 +45,8 @@ public class BuildTest { public final RavenwoodRule mRavenwood = new RavenwoodRule(); @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + public final SetFlagsRule mSetFlagsRule = new SetFlagsRule( + SetFlagsRule.DefaultInitValueType.NULL_DEFAULT); /** * Asserts that a String is non-null and non-empty. If it is not, diff --git a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java index fc2e5b0981e4..0703db2ab648 100644 --- a/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/app/GameManagerServiceTests.java @@ -118,7 +118,8 @@ import java.util.function.Supplier; @Presubmit public class GameManagerServiceTests { @Mock MockContext mMockContext; - @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); + @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule( + SetFlagsRule.DefaultInitValueType.NULL_DEFAULT); private static final String TAG = "GameManagerServiceTests"; private static final String PACKAGE_NAME_INVALID = "com.android.app"; private static final int USER_ID_1 = 1001; |