diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/Utils.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/fuelgauge/PowerUsageDetail.java | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index de9fac7..08cfc58 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -613,6 +613,8 @@ public final class Utils { int titleResId, CharSequence title, boolean isShortcut, UserHandle userHandle) { Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId, title, isShortcut); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); context.startActivityAsUser(intent, userHandle); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index 36a2444..3b8ecbe 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -259,8 +259,14 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types); args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values); - caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args, - R.string.details_title, null, new UserHandle(userId)); + // This is a workaround, see b/17523189 + if (userId == UserHandle.myUserId()) { + caller.startPreferencePanel(PowerUsageDetail.class.getName(), args, + R.string.details_title, null, null, 0); + } else { + caller.startPreferencePanelAsUser(PowerUsageDetail.class.getName(), args, + R.string.details_title, null, new UserHandle(userId)); + } } public static final int ACTION_DISPLAY_SETTINGS = 1; |