diff options
| author | Tom Natan <tomnatan@google.com> | 2021-04-01 19:54:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-01 19:54:26 +0000 |
| commit | b539e01c8bcfe05f47fa5264d4fa2ef42cabadfc (patch) | |
| tree | 1cc09eaffc0080b88bd06acb056b5683f2be451a /core/java/android | |
| parent | 92ed40770bd6ef5298de494837b6516e2646b237 (diff) | |
| parent | 319253aa57533fa173b03080921d5a5dc09e9cc8 (diff) | |
Merge "Mark force resize/non-resize changes as @Overridable" into sc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 0952b3e1233c..fa457e61a914 100644 --- 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 |