From 15bfc8ac912a57d0a7958674ad52fea2f9663c3e Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Mon, 10 May 2021 14:35:54 -0700
Subject: [PATCH] Add apex_available for SettingsLib libraries used by
 PermissionController.

Bug: 14490549
Test: presubmit
Change-Id: If7796ac8686c03b7b18017e81db8ab7fe7952ba2
---
 packages/SettingsLib/FooterPreference/Android.bp      | 4 ++++
 packages/SettingsLib/RadioButtonPreference/Android.bp | 4 ++++
 packages/SettingsLib/TwoTargetPreference/Android.bp   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/packages/SettingsLib/FooterPreference/Android.bp b/packages/SettingsLib/FooterPreference/Android.bp
index 11f39e7bb210a..0929706f27ba7 100644
--- a/packages/SettingsLib/FooterPreference/Android.bp
+++ b/packages/SettingsLib/FooterPreference/Android.bp
@@ -20,4 +20,8 @@ android_library {
     ],
     sdk_version: "system_current",
     min_sdk_version: "21",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
 }
diff --git a/packages/SettingsLib/RadioButtonPreference/Android.bp b/packages/SettingsLib/RadioButtonPreference/Android.bp
index b309c01e0b7b0..28ff71f228402 100644
--- a/packages/SettingsLib/RadioButtonPreference/Android.bp
+++ b/packages/SettingsLib/RadioButtonPreference/Android.bp
@@ -20,4 +20,8 @@ android_library {
 
     sdk_version: "system_current",
     min_sdk_version: "21",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
 }
diff --git a/packages/SettingsLib/TwoTargetPreference/Android.bp b/packages/SettingsLib/TwoTargetPreference/Android.bp
index 078e8c3388efb..b32d5b40a13a0 100644
--- a/packages/SettingsLib/TwoTargetPreference/Android.bp
+++ b/packages/SettingsLib/TwoTargetPreference/Android.bp
@@ -19,4 +19,8 @@ android_library {
     ],
     sdk_version: "system_current",
     min_sdk_version: "21",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
 }