From 34e61996c502753062608b1a8b3e64bd488e4370 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Thu, 5 Mar 2020 13:46:26 -0800
Subject: [PATCH] Disable APN lockdown for apps targeting pre-R

Allow apps targeting pre-R to access the APN db without permissions

Bug: 148552357
Test: manual
Change-Id: I47d142e9984b932f030c29729b9ebcd75c51d26f
---
 core/java/android/provider/Telephony.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index adfa885f121e0..4698703ea85c3 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -25,6 +25,7 @@ import android.annotation.SdkConstant.SdkConstantType;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
 import android.compat.annotation.ChangeId;
+import android.compat.annotation.EnabledAfter;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -4036,6 +4037,7 @@ public final class Telephony {
          * @hide
          */
         @ChangeId
+        @EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.Q)
         public static final long APN_READING_PERMISSION_CHANGE_ID = 124107808L;
     }