From 487fd35179ddf2e7f9e569610664fb72adcd8b80 Mon Sep 17 00:00:00 2001 From: Bartosz Fabianowski Date: Mon, 3 Apr 2017 13:29:12 +0200 Subject: [PATCH] Launch Intents from QS security footer as current user Intents triggered from QS should be resolved as the current user, not as the user that QS is running as (which will always be user 0). ActivityStarter knows how to do this and can handle this for us automatically. Bug: 36118203 Test: Manual Change-Id: I48d880f0a17d7a9f218ab07ef807ad49ebeda624 (cherry picked from commit e46e2b944ae074b6de6680bf6af4e09a70fe9a4f) --- .../src/com/android/systemui/qs/QSSecurityFooter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 4b2c20f4f7db9..5b9d95d3e2c07 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -1,3 +1,4 @@ + /* * Copyright (C) 2014 The Android Open Source Project * @@ -358,9 +359,8 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic @Override public void onClick(View widget) { final Intent intent = new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); mDialog.dismiss(); - mContext.startActivity(intent); + mActivityStarter.postStartActivityDismissingKeyguard(intent, 0); } @Override @@ -373,9 +373,8 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic @Override public void onClick(View widget) { final Intent intent = new Intent(Settings.ACTION_VPN_SETTINGS); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); mDialog.dismiss(); - mContext.startActivity(intent); + mActivityStarter.postStartActivityDismissingKeyguard(intent, 0); } } }