am d2cc56eb: resolved conflicts for merge of f8a58208 to master

* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded

core/java/android/content/pm/ActivityInfo.java

@@ -198,7 +198,7 @@ public class ActivityInfo extends ComponentInfo
     /**
      * @hide Bit in {@link #flags}: If set, this component will only be seen
      * by the primary user.  Only works with broadcast receivers.  Set from the
-     * {@link android.R.attr#primaryUserOnly} attribute.
+     * android.R.attr#primaryUserOnly attribute.
      */
     public static final int FLAG_PRIMARY_USER_ONLY = 0x20000000;
     /**
@@ -209,6 +209,13 @@ public class ActivityInfo extends ComponentInfo
      * components; it is not applied to activities.
      */
     public static final int FLAG_SINGLE_USER = 0x40000000;
+    /**
+     * @hide Bit in {@link #flags}: If set, this activity may be launched into an
+     * owned ActivityContainer such as that within an ActivityView. If not set and
+     * this activity is launched into such a container a SecurityExcception will be
+     * thrown. Set from the {@link android.R.attr#allowEmbedded} attribute.
+     */
+    public static final int FLAG_ALLOW_EMBEDDED = 0x80000000;
     /**
      * Options that have been set in the activity declaration in the
      * manifest.

core/java/android/content/pm/PackageParser.java

@@ -2452,6 +2452,12 @@ public class PackageParser {
             a.info.flags |= ActivityInfo.FLAG_PERSISTABLE;
         }
 
+        if (sa.getBoolean(
+                com.android.internal.R.styleable.AndroidManifestActivity_allowEmbedded,
+                false)) {
+            a.info.flags |= ActivityInfo.FLAG_ALLOW_EMBEDDED;
+        }
+
         if (!receiver) {
             if (sa.getBoolean(
                     com.android.internal.R.styleable.AndroidManifestActivity_hardwareAccelerated,