Merge "Launch Intents from QS security footer as current user" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-04-04 14:04:31 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}
}
}