commit | d3bb3b229133d47386d813684b9dc8e9ad1a15cb | [log] [tgz] |
---|---|---|
author | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | Sat Feb 22 03:26:04 2020 +0000 |
committer | Android Build Role Account android-build-prod <android-build-team-robot@google.com> | Sat Feb 22 03:26:04 2020 +0000 |
tree | eaa85754ed0c4846756a0b60203d1791b4f3efa0 | |
parent | 420718e051aab192bb79eca8d71ddcdf9feff5fd [diff] | |
parent | be2a1e1d11f42d78849c7b0cd32a34bf2dcea9d7 [diff] |
Snap for 6227608 from be2a1e1d11f42d78849c7b0cd32a34bf2dcea9d7 to r-keystone-qcom-release Change-Id: Ib60c56c3746bd201fb6b3d76b13e990094b2e06b
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); }