Merge "Mark force resize/non-resize changes as @Overridable" into sc-dev am: b539e01c8b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996768 Change-Id: I7b1ebde3422193aea6b12a677e8f75175ac1afc8
2021-04-01 20:14:26 +00:00
parent a0cabf28ad b539e01c8b
commit 3d722a0917
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -901,6 +901,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
     * @hide
     */
    @ChangeId
+    @Overridable
    @Disabled
    @TestApi
    public static final long FORCE_RESIZE_APP = 174042936L; // buganizer id
@@ -910,6 +911,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
     * @hide
     */
    @ChangeId
+    @Overridable
    @Disabled
    @TestApi
    public static final long FORCE_NON_RESIZE_APP = 181136395L; // buganizer id