summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wu <topjohnwu@google.com>2023-04-27 22:34:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-04-27 22:34:38 +0000
commitc25ce06fb0916e7cd7e3b1737945129a47793d65 (patch)
tree96955ca77a485059169661441e2528b8b52444c0
parent47dd6d7279bb2c5a5e34da690bef38d358bd1a50 (diff)
parent129c8e7991ad6bfcf1dc06adcaac9ab1600c45fd (diff)
downloadbase-c25ce06fb0916e7cd7e3b1737945129a47793d65.tar.gz
Merge "Revert intent filter matching enforcement." into android13-tests-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerServiceUtils.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index 3443d455ee82..84b3bd13215b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
+++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
@@ -38,7 +38,7 @@ import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.ActivityManager;
import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledSince;
+import android.compat.annotation.Disabled;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -149,7 +149,7 @@ public class PackageManagerServiceUtils {
* allow 3P apps to trigger internal-only functionality.
*/
@ChangeId
- @EnabledSince(targetSdkVersion = Build.VERSION_CODES.TIRAMISU)
+ @Disabled /* Revert enforcement: b/274147456 */
private static final long ENFORCE_INTENTS_TO_MATCH_INTENT_FILTERS = 161252188;
/**