tree 3b848189d1bc1a2238caf1d1285953232c35806a
parent 8738f6764b9f61eb11ad678cad6d9434b4133731
author Philip P. Moltmann <moltmann@google.com> 1526930156 +0000
committer Philip P. Moltmann <moltmann@google.com> 1526933345 -0700

DO NOT MERGE: Revert "DO NOT MERGE: Revert "Allow mocks to call blackisted APIs""

This reverts commit 8738f6764b9f61eb11ad678cad6d9434b4133731.

Reason for revert: This was only a temporary revert. Now that the real issue is fixed, we can submit this again
Bug: 80041014
Test: vts-tradefed run host --class com.android.tradefed.device.metric.VtsCoverageCollectorTest
      atest CtsActivityManagerDeviceTestCases
      atest CtsInputMethodTestCases
Change-Id: I8d0ac45e3fe73c1870cf08f989b6d39f09923183