commit e633eb00a0ab352b4e1a390bb622c7a6ffa2fb68
author Wale Ogunwale <ogunwale@google.com> Thu Mar 30 12:57:29 2017 -0700
committer Wale Ogunwale <ogunwale@google.com> Thu Mar 30 15:34:41 2017 -0700
tree 2accb85ca06537aa67917299372911a95944ab6e
parent 261dd2305ac93fafb7d545a7f16a155e558dcfb0

Fix issue with force resizing activity when app level doesn't want to

Don't force resize activity whose manifest attribute has
resizeableActivity set to false at the application tag level.

Fixes: 36704475
Test: Launch an app that disables resizeableActivity at the app level
in multi-window mode.

Change-Id: I73137175290355266a4d3ecc469e7a39d73dbc62

core/java/android/content/pm/ApplicationInfo.java

diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 939e20f..5f53e27 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -523,12 +523,21 @@
     public static final int PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER = 1 << 9;
 
     /**
-     * When set, the application explicitly requested that its activities by resizeable by default.
+     * When set, the application explicitly requested that its activities be resizeable by default.
      * @see android.R.styleable#AndroidManifestActivity_resizeableActivity
      *
      * @hide
      */
-    public static final int PRIVATE_FLAG_RESIZEABLE_ACTIVITIES_EXPLICITLY_SET = 1 << 10;
+    public static final int PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE = 1 << 10;
+
+    /**
+     * When set, the application explicitly requested that its activities *not* be resizeable by
+     * default.
+     * @see android.R.styleable#AndroidManifestActivity_resizeableActivity
+     *
+     * @hide
+     */
+    public static final int PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_UNRESIZEABLE = 1 << 11;
 
     /**
      * The application isn't requesting explicitly requesting for its activities to be resizeable or
@@ -542,7 +551,8 @@
      *
      * @hide
      */
-    public static final int PRIVATE_FLAG_RESIZEABLE_ACTIVITIES_VIA_SDK_VERSION = 1 << 11;
+    public static final int PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_RESIZEABLE_VIA_SDK_VERSION =
+            1 << 12;
 
     /**
      * Value for {@link #privateFlags}: {@code true} means the OS should go ahead and
@@ -550,14 +560,14 @@
      * foreground-equivalent run state.  Defaults to {@code false} if unspecified.
      * @hide
      */
-    public static final int PRIVATE_FLAG_BACKUP_IN_FOREGROUND = 1 << 12;
+    public static final int PRIVATE_FLAG_BACKUP_IN_FOREGROUND = 1 << 13;
 
     /**
      * Value for {@link #privateFlags}: {@code true} means this application
      * contains a static shared library. Defaults to {@code false} if unspecified.
      * @hide
      */
-    public static final int PRIVATE_FLAG_STATIC_SHARED_LIBRARY = 1 << 13;
+    public static final int PRIVATE_FLAG_STATIC_SHARED_LIBRARY = 1 << 14;
 
     /**
      * Value for {@linl #privateFlags}: When set, the application will only have its splits loaded
@@ -565,7 +575,7 @@
      * {@link Context#createContextForSplit(String)} API.
      * @hide
      */
-    public static final int PRIVATE_FLAG_ISOLATED_SPLIT_LOADING = 1 << 14;
+    public static final int PRIVATE_FLAG_ISOLATED_SPLIT_LOADING = 1 << 15;
 
     /**
      * Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.