Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev

am: becebcbc6d

Change-Id: I8882135a4c1f8e385d6cef563f01913350260013
This commit is contained in:
Tony Mak
2016-06-13 12:34:39 +00:00
committed by android-build-merger

View File

@@ -127,7 +127,7 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_NEGATIVE) {
final Intent settingsIntent = new Intent(ACTION_VPN_SETTINGS);
mContext.startActivityAsUser(settingsIntent, UserHandle.CURRENT);
mHost.startActivityDismissingKeyguard(settingsIntent);
}
}