Merge "Fix not able to add Settings shortcut widget problem" into sc-v2-dev am: 7655d161ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15892809

Change-Id: I2a982c636bcf7b7709c697a3bfaaa41e5999bbeb

src/com/android/settings/SettingsActivity.java

@@ -384,6 +384,7 @@ public class SettingsActivity extends SettingsBaseActivity
         trampolineIntent.putExtra(
                 android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI,
                 intent.toUri(Intent.URI_INTENT_SCHEME));
+        trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
         startActivity(trampolineIntent);
 
         return true;

src/com/android/settings/homepage/SettingsHomepageActivity.java

@@ -212,6 +212,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
         intent.setAction(null);
 
         targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK);
+        targetIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
         // Sender of intent may want to send intent extra data to the destination of targetIntent.
         targetIntent.replaceExtras(intent);