From a5cb6fe9bb5c39a06cfcb21d81cceb5b36a606fa Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 31 Mar 2020 20:30:18 +0100
Subject: [PATCH] Remove neverallow rules for framework-mediaprovider

We actually want some targets (in particular, the MediaProvider apk)
to link against framework-mediaprovider.

The gist of what the neverallow rule achieves (disallow general use)
is achieved equally well with visibility rules, which
framework-mediaprovider already has.

Bug: 152891096
Test: m nothing
Change-Id: Ic4b0a571985b9ad1dfdd56d45035f224a622700e
---
 android/neverallow.go      |  9 ---------
 android/neverallow_test.go | 13 -------------
 2 files changed, 22 deletions(-)

diff --git a/android/neverallow.go b/android/neverallow.go
index 73cd6e345..8fcfb8a6e 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -52,7 +52,6 @@ func init() {
 	AddNeverAllowRules(createTrebleRules()...)
 	AddNeverAllowRules(createLibcoreRules()...)
 	AddNeverAllowRules(createMediaRules()...)
-	AddNeverAllowRules(createMediaProviderRules()...)
 	AddNeverAllowRules(createJavaDeviceForHostRules()...)
 }
 
@@ -161,14 +160,6 @@ func createMediaRules() []Rule {
 	}
 }
 
-func createMediaProviderRules() []Rule {
-	return []Rule{
-		NeverAllow().
-			With("libs", "framework-mediaprovider").
-			Because("framework-mediaprovider includes private APIs. Use framework_mediaprovider_stubs instead."),
-	}
-}
-
 func createJavaDeviceForHostRules() []Rule {
 	javaDeviceForHostProjectsWhitelist := []string{
 		"external/guava",
diff --git a/android/neverallow_test.go b/android/neverallow_test.go
index b57bb3fd6..6f07a4a73 100644
--- a/android/neverallow_test.go
+++ b/android/neverallow_test.go
@@ -202,19 +202,6 @@ var neverallowTests = []struct {
 			"updatable-media includes private APIs. Use updatable_media_stubs instead.",
 		},
 	},
-	{
-		name: "dependency on framework-mediaprovider",
-		fs: map[string][]byte{
-			"Android.bp": []byte(`
-				java_library {
-					name: "needs_framework_mediaprovider",
-					libs: ["framework-mediaprovider"],
-				}`),
-		},
-		expectedErrors: []string{
-			"framework-mediaprovider includes private APIs. Use framework_mediaprovider_stubs instead.",
-		},
-	},
 	{
 		name: "java_device_for_host",
 		fs: map[string][]byte{