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
This commit is contained in:
Andrei-Valentin Onea
2020-11-12 15:05:02 +00:00
committed by Automerger Merge Worker

View File

@@ -40,7 +40,7 @@ import android.app.PropertyInvalidatedCache;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.usage.StorageStatsManager; import android.app.usage.StorageStatsManager;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter; import android.compat.annotation.EnabledSince;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -3691,7 +3691,7 @@ public abstract class PackageManager {
* @hide * @hide
*/ */
@ChangeId @ChangeId
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q) @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)
public static final long FILTER_APPLICATION_QUERY = 135549675L; public static final long FILTER_APPLICATION_QUERY = 135549675L;
/** {@hide} */ /** {@hide} */