commit c25ce06fb0916e7cd7e3b1737945129a47793d65
author John Wu <topjohnwu@google.com> Thu Apr 27 22:34:38 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 27 22:34:38 2023 +0000
tree 96955ca77a485059169661441e2528b8b52444c0
parent 47dd6d7279bb2c5a5e34da690bef38d358bd1a50
parent 129c8e7991ad6bfcf1dc06adcaac9ab1600c45fd

Merge "Revert intent filter matching enforcement." into android13-tests-dev

services/core/java/com/android/server/pm/PackageManagerServiceUtils.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java
index 3443d45..84b3bd1 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.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 @@
      * 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;
 
     /**