commit 741abfc12074623d24297ebb67d98cb2d9126add
author Nicolas Prevot <nprevot@google.com> Tue Aug 11 12:03:51 2015 +0100
committer Nicolas Prévot <nprevot@google.com> Thu Aug 20 12:14:37 2015 +0000
tree 45407287c30ed8ec9c61d96c6d48eeb3f2f2e937
parent 2af03d2a7ac0eff78d1646b66e242b17e12165cd

Fix cross-profile intent filters with system-user split.

Don't assume that the parent is always the user owner.

BUG:23105562
Change-Id: Ia98ed608e2b6d1d82d95a73110134d85274c6abf

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index d591f8b..2fcce67 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2658,7 +2658,7 @@
                 android:exported="true"
                 >
         </activity>
-        <activity-alias android:name="com.android.internal.app.ForwardIntentToUserOwner"
+        <activity-alias android:name="com.android.internal.app.ForwardIntentToParent"
                 android:targetActivity="com.android.internal.app.IntentForwarderActivity"
                 android:exported="true"
                 android:label="@string/user_owner_label">