26e81d2a47de64e8cc6b160ea44033aa6b23a907 - SHIFTPHONES/android_frameworks_base

commit	26e81d2a47de64e8cc6b160ea44033aa6b23a907	[log] [tgz]
author	Paul Duffin <paulduffin@google.com>	Thu Mar 09 18:49:41 2017 +0000
committer	Paul Duffin <paulduffin@google.com>	Fri Mar 10 14:19:18 2017 +0000
tree	10f689ca9590fa47850b609853f74718a9d428c2
parent	b224b318a03f794fa378e488f6844f8a1e66e7e7 [diff]

Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f

core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java[diff]
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java[diff]
services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java[diff]
services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java[diff]
services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java[diff]

6 files changed

tree: 10f689ca9590fa47850b609853f74718a9d428c2