Merge "Remove flagging from launched ASM APIs" into main (9b6e831d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ package android {
		field public static final int allowBackup = 16843392; // 0x1010280
		field public static final int allowClearUserData = 16842757; // 0x1010005
		field public static final int allowClickWhenDisabled = 16844312; // 0x1010618
		field @FlaggedApi("android.security.asm_restrictions_enabled") public static final int allowCrossUidActivitySwitchFromBelow = 16844449; // 0x10106a1
		field public static final int allowCrossUidActivitySwitchFromBelow = 16844449; // 0x10106a1
		field public static final int allowEmbedded = 16843765; // 0x10103f5
		field public static final int allowGameAngleDriver = 16844376; // 0x1010658
		field public static final int allowGameDownscaling = 16844377; // 0x1010659
		@@ -4684,7 +4684,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 @FlaggedApi("android.security.asm_restrictions_enabled") public void setAllowCrossUidActivitySwitchFromBelow(boolean);
		method public void setAllowCrossUidActivitySwitchFromBelow(boolean);
		method public void setContentTransitionManager(android.transition.TransitionManager);
		method public void setContentView(@LayoutRes int);
		method public void setContentView(android.view.View);

core/java/android/app/Activity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -9894,7 +9894,6 @@ 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)
		@SuppressLint("OnNameExpected")
		public void setAllowCrossUidActivitySwitchFromBelow(boolean allowed) {
		ActivityClient.getInstance().setAllowCrossUidActivitySwitchFromBelow(mToken, allowed);

core/res/res/values/attrs_manifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -2080,7 +2080,6 @@
		other applications in the same task. If set to false, activity launches which would
		replace this application with another when in the user's view will be blocked.
		The default is true. -->
		<!-- @FlaggedApi("android.security.asm_restrictions_enabled") -->
		<attr name="allowCrossUidActivitySwitchFromBelow" format="boolean" />
		<attr name="persistent" />
		<attr name="persistentWhenFeatureAvailable" />

core/res/res/values/public-final.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -3801,7 +3801,6 @@
		<public name="supportsConnectionlessStylusHandwriting" />
		<!-- @FlaggedApi("android.nfc.nfc_observe_mode") -->
		<public name="shouldDefaultToObserveMode"/>
		<!-- @FlaggedApi("android.security.asm_restrictions_enabled") -->
		<public name="allowCrossUidActivitySwitchFromBelow"/>
		<!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") -->
		<public name="shiftDrawingOffsetForStartOverhang" />
		@@ -3856,7 +3855,6 @@
		<public type="attr" name="supportsConnectionlessStylusHandwriting" id="0x0101069f" />
		<!-- @FlaggedApi("android.nfc.nfc_observe_mode") -->
		<public type="attr" name="shouldDefaultToObserveMode" id="0x010106a0" />
		<!-- @FlaggedApi("android.security.asm_restrictions_enabled") -->
		<public type="attr" name="allowCrossUidActivitySwitchFromBelow" id="0x010106a1" />
		<!-- @FlaggedApi("com.android.text.flags.use_bounds_for_width") -->
		<public type="attr" name="shiftDrawingOffsetForStartOverhang" id="0x010106a2" />

lint-baseline.xml

+0 −33

Original line number	Diff line number	Diff line
		@@ -7767,17 +7767,6 @@
		column="36"/>
		</issue>

		<issue
		id="FlaggedApi"
		message="@FlaggedApi should specify an actual flag constant; raw strings are discouraged (and more importantly, not enforced)"
		errorLine1=" @android.annotation.FlaggedApi("android.security.asm_restrictions_enabled")"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="out/soong/.intermediates/frameworks/base/core/res/framework-res/android_common/gen/android/R.srcjar!/android/R.java"
		line="759"
		column="36"/>
		</issue>

		<issue
		id="FlaggedApi"
		message="@FlaggedApi should specify an actual flag constant; raw strings are discouraged (and more importantly, not enforced)"
		@@ -8196,28 +8185,6 @@
		column="36"/>
		</issue>

		<issue
		id="FlaggedApi"
		message="@FlaggedApi should specify an actual flag constant; raw strings are discouraged (and more importantly, not enforced)"
		errorLine1=" @android.annotation.FlaggedApi("android.security.asm_restrictions_enabled")"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="out/soong/.intermediates/frameworks/base/core/res/framework-res/android_common/gen/android/R.srcjar!/android/R.java"
		line="25837"
		column="36"/>
		</issue>

		<issue
		id="FlaggedApi"
		message="@FlaggedApi should specify an actual flag constant; raw strings are discouraged (and more importantly, not enforced)"
		errorLine1=" @android.annotation.FlaggedApi("android.security.asm_restrictions_enabled")"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="out/soong/.intermediates/frameworks/base/core/res/framework-res/android_common/gen/android/R.srcjar!/android/R.java"
		line="27173"
		column="36"/>
		</issue>

		<issue
		id="FlaggedApi"
		message="@FlaggedApi should specify an actual flag constant; raw strings are discouraged (and more importantly, not enforced)"