diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:24 -0700 |
| commit | 00f4886c5390fd386b476ade4ab83fa28352bcde (patch) | |
| tree | ea5cc23ec64781b7a7127b9b331cf4bf3ed2a9a4 | |
| parent | 461fe849522042af0d82cdf5b1dbedc249091f1a (diff) | |
| parent | 43f9f9b5ad3f66b610e3f0a5d9062af3170ae8d8 (diff) | |
| download | dexmaker-temp_sam_168057903.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I58ff28922771260a405840349a7a302484a70d8c
Change-Id: Ida0c7fa996ae47f0c9f9fdb650b4d0968142c98b
3 files changed, 5 insertions, 3 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 365ab7d..a971772 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,5 +1,5 @@ { - "postsubmit": [ + "presubmit": [ { "name": "CtsMockingTestCases", "options": [ diff --git a/dexmaker-mockito-inline-extended/src/main/java/com/android/dx/mockito/inline/InlineStaticMockMaker.java b/dexmaker-mockito-inline-extended/src/main/java/com/android/dx/mockito/inline/InlineStaticMockMaker.java index f764e07..6ba11cd 100644 --- a/dexmaker-mockito-inline-extended/src/main/java/com/android/dx/mockito/inline/InlineStaticMockMaker.java +++ b/dexmaker-mockito-inline-extended/src/main/java/com/android/dx/mockito/inline/InlineStaticMockMaker.java @@ -126,7 +126,8 @@ public final class InlineStaticMockMaker implements MockMaker { public InlineStaticMockMaker() { if (INITIALIZATION_ERROR != null) { throw new RuntimeException("Could not initialize inline mock maker.\n" + "\n" + - "Release: Android " + Build.VERSION.RELEASE + " " + Build.VERSION.INCREMENTAL + "Release: Android " + Build.VERSION.RELEASE_OR_CODENAME + " " + + Build.VERSION.INCREMENTAL + "Device: " + Build.BRAND + " " + Build.MODEL, INITIALIZATION_ERROR); } diff --git a/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java b/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java index 0a594e0..9741118 100644 --- a/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java +++ b/dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java @@ -180,7 +180,8 @@ public final class InlineDexmakerMockMaker implements InlineMockMaker { throw new RuntimeException( "Could not initialize inline mock maker.\n" + "\n" - + "Release: Android " + Build.VERSION.RELEASE + " " + Build.VERSION.INCREMENTAL + + "Release: Android " + Build.VERSION.RELEASE_OR_CODENAME + " " + + Build.VERSION.INCREMENTAL + "Device: " + Build.BRAND + " " + Build.MODEL, INITIALIZATION_ERROR); } |