commit | be2a1e1d11f42d78849c7b0cd32a34bf2dcea9d7 | [log] [tgz] |
---|---|---|
author | Steven Laver <lavers@google.com> | Fri Feb 14 13:17:25 2020 -0800 |
committer | Steven Laver <lavers@google.com> | Fri Feb 14 13:17:25 2020 -0800 |
tree | eaa85754ed0c4846756a0b60203d1791b4f3efa0 | |
parent | a86082eedea63a1de4a222feb7a736f33dc3fbdc [diff] | |
parent | 84237965e415b94574793e96150472abba2b34cf [diff] |
Merge RP1A.200214.001 Change-Id: If3c6d9c84037ef221e7dbda07087643ab1736b49
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 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 @@ 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); }