diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2022-09-20 12:21:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-20 12:21:07 +0000 |
| commit | 7fc0cee7c5c2466bc89f38434606898f3a9d27ff (patch) | |
| tree | 65ce22f04e114febf8e2f83e3d080b7eabdbb1c2 /dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java | |
| parent | 6fa21669c557129371c564c6eaa4db41dbca9c6e (diff) | |
| parent | 7213f340552983890c00de7efadd0968c07bb5f5 (diff) | |
| download | dexmaker-7fc0cee7c5c2466bc89f38434606898f3a9d27ff.tar.gz | |
Merge "Revert "Update to upstream dexmaker"" am: 6f5561ba7b am: d30351c99c am: 79aba3b995 am: 7213f34055
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2216810
Change-Id: I2651a6e6817c811080dbee496f9beefc972cb7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java')
| -rw-r--r-- | dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/InlineDexmakerMockMaker.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |