commit 018f8b17d637e174e6c822d17484edd5c04f72fb
author Hall Liu <hallliu@google.com> Tue Feb 25 15:58:56 2020 -0800
committer Hall Liu <hallliu@google.com> Tue Mar 03 12:43:46 2020 -0800
tree 2020745cb373371bbfc5600c8ec59cbc86659c23
parent 3e1d618b5c3c18081e26dc20b33f61f2da463c1d

Change the APN lockdown to gate on PlatformCompat

Instead of just logging access denials to the APN db with
PlatformCompat, query them for whether the caller should be allowed
through and vary our behavior based off that.

Fixes: 144631034
Test: atest TelephonyProviderHostTest
Change-Id: I209218d1b91df3ea1fac690a1a8570dcc87505a0

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ea2dd7..0a9802d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,6 +26,10 @@
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
 
+    <!-- Used to access PlatformCompat for security fix enforcement -->
+    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
+    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE" />
+
     <protected-broadcast android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
     <protected-broadcast android:name="android.intent.action.CONTENT_CHANGED" />