summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2021-04-28 17:38:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-28 17:38:02 +0000
commit0dd282ed17868fc98b8905c06b222c8877657aa0 (patch)
treed3c05b4d36d771939a6340356b61f9a6e2f0b1e6
parent1f791d2bea21a574401d0ddb0b20fbc2005203fa (diff)
parentcf54bade743ef80efc07fdfc490e19a52d92af51 (diff)
downloadCalendarProvider-0dd282ed17868fc98b8905c06b222c8877657aa0.tar.gz
Disable the calendar provider strict SQL check for now am: cf54bade74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/14328744 Change-Id: Ie52ef45502b69e52c4518180b091574609ae9b86
-rw-r--r--src/com/android/providers/calendar/CalendarProvider2.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index 57f60d9..389b5b9 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -25,7 +25,7 @@ import android.app.AppOpsManager;
import android.app.PendingIntent;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledAfter;
+import android.compat.annotation.Disabled;
import android.content.BroadcastReceiver;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
@@ -464,7 +464,7 @@ public class CalendarProvider2 extends SQLiteContentProvider implements OnAccoun
* malicious arguments.
*/
@ChangeId
- @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)
+ @Disabled
private static final long ENFORCE_STRICT_QUERY_BUILDER = 143231523L;
private final ThreadLocal<Boolean> mCallingPackageErrorLogged = new ThreadLocal<Boolean>();