summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api/current.txt2
-rw-r--r--core/java/android/app/Activity.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 812d4cd67ab7..d6fa7c516b77 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -4516,7 +4516,7 @@ package android.app {
method @NonNull public final <T extends android.view.View> T requireViewById(@IdRes int);
method public final void runOnUiThread(Runnable);
method public void setActionBar(@Nullable android.widget.Toolbar);
- method public void setAllowCrossUidActivitySwitchFromBelow(boolean);
+ method @FlaggedApi("android.security.asm_restrictions_enabled") public void setAllowCrossUidActivitySwitchFromBelow(boolean);
method public void setContentTransitionManager(android.transition.TransitionManager);
method public void setContentView(@LayoutRes int);
method public void setContentView(android.view.View);
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 6c10f495e7bf..8e524acc6d1c 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -9383,6 +9383,7 @@ public class Activity extends ContextThemeWrapper
* @param allowed {@code true} to disable the UID restrictions; {@code false} to revert back to
* the default behaviour
*/
+ @FlaggedApi(android.security.Flags.FLAG_ASM_RESTRICTIONS_ENABLED)
public void setAllowCrossUidActivitySwitchFromBelow(boolean allowed) {
ActivityClient.getInstance().setAllowCrossUidActivitySwitchFromBelow(mToken, allowed);
}