summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei-Valentin Onea <andreionea@google.com> 2020-11-12 15:18:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-12 15:18:16 +0000
commit6a8af4fd1dd4dc2f3c3cf1b4af40c99cde35f22c (patch)
tree7ecb60bd5333b5c2b94c2b297258f58a8a71d610
parentc2ae2b1299646b52d95a25a904220584e4f8cf41 (diff)
parent056959a18695c67bc253c455383384ee6d57f40a (diff)
Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745 am: 9aa009684b am: fe2b1a414c am: 056959a186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492847 Change-Id: Ib81bef18d09760f9c3674e520fa7a2f9f9928da3
-rw-r--r--core/java/android/content/pm/PackageManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index a77d8b17e1f7..74370c3ac6ce 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -40,7 +40,7 @@ import android.app.PropertyInvalidatedCache;
import android.app.admin.DevicePolicyManager;
import android.app.usage.StorageStatsManager;
import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledAfter;
+import android.compat.annotation.EnabledSince;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.Context;
@@ -3765,7 +3765,7 @@ public abstract class PackageManager {
* @hide
*/
@ChangeId
- @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)
+ @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)
public static final long FILTER_APPLICATION_QUERY = 135549675L;
/** {@hide} */