summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei-Valentin Onea <andreionea@google.com>2020-11-12 15:05:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-12 15:05:02 +0000
commit056959a18695c67bc253c455383384ee6d57f40a (patch)
tree0984c061d034a19b9b53828b0675ee9d32f300af
parent5d9e485533f5fa31d17eecab63faa84cd8e97504 (diff)
parentfe2b1a414cbf53c06c6496fec753f1bfd62b8b53 (diff)
Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745 am: 9aa009684b am: fe2b1a414c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492847 Change-Id: I1d179c79948d987f4b0d51f642ddf81b99f28e2b
-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 ef34ea68a74d..dd258fa61ce8 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;
@@ -3691,7 +3691,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} */