From a7f399123f12269a836c4c79471b7750ad673fcb Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Wed, 19 Mar 2014 10:38:05 -0700
Subject: [PATCH] Injected settings start new task

- Bug: 13534214

Change-Id: I10b47f58651166a58a86efe8da2979e8f9a2a5cb
---
 src/com/android/settings/location/SettingsInjector.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index 76b3103db60..5f8d0306d2e 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -254,8 +254,11 @@ class SettingsInjector {
         Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
         pref.setIcon(icon);
 
+        // Activity to start if they click on the preference. Must start in new task to ensure
+        // that "android.settings.LOCATION_SOURCE_SETTINGS" brings user back to Settings > Location.
         Intent settingIntent = new Intent();
         settingIntent.setClassName(info.packageName, info.settingsActivity);
+        settingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         pref.setIntent(settingIntent);
 
         prefs.add(pref);