From a676b9934cc0cac9b6e6e6b8a531bcd3d74acdfa Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 3 Jan 2020 02:06:36 +0000
Subject: [PATCH] Revert "ConnectivityManagerTest: grant access to Wifi @hide
 APIs"

This reverts commit 434fe602b8c06c609a2be79f855f20dbe5200c40.

Reason for revert: Broke build

Change-Id: I15d6fbf06902987e0517f4c72cbf440b7b570a60
---
 core/tests/ConnectivityManagerTest/Android.bp | 2 +-
 wifi/Android.bp                               | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/tests/ConnectivityManagerTest/Android.bp b/core/tests/ConnectivityManagerTest/Android.bp
index 6b828ccda1983..a33d219f53d27 100644
--- a/core/tests/ConnectivityManagerTest/Android.bp
+++ b/core/tests/ConnectivityManagerTest/Android.bp
@@ -21,6 +21,6 @@ android_test {
     static_libs: ["junit"],
     // Include all test java files.
     srcs: ["src/**/*.java"],
-    defaults: ["framework-wifi-test-defaults"],
+    platform_apis: true,
     certificate: "platform",
 }
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 52838f3c2f181..81559224f7002 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -47,7 +47,6 @@ test_access_hidden_api_whitelist = [
     "//frameworks/base/wifi/tests",
     "//frameworks/opt/net/wifi/tests/wifitests:__subpackages__",
 
-    "//frameworks/base/core/tests/ConnectivityManagerTest",
     "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests",
 ]