Change Quick Settings to account for branded VPNs. am: 10422896ed (143acd35) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -153,9 +153,14 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic
	hasCACerts, hasCACertsInWorkProfile, isNetworkLoggingEnabled, vpnName,		hasCACerts, hasCACertsInWorkProfile, isNetworkLoggingEnabled, vpnName,
	vpnNameWorkProfile, organizationName, workProfileName);		vpnNameWorkProfile, organizationName, workProfileName);
	// Update the icon		// Update the icon
	int footerIconId = vpnName != null \|\| vpnNameWorkProfile != null		int footerIconId = R.drawable.ic_info_outline;
	? R.drawable.ic_qs_vpn		if (vpnName != null \|\| vpnNameWorkProfile != null) {
	: R.drawable.ic_info_outline;		if (mSecurityController.isVpnBranded()) {
			footerIconId = R.drawable.ic_qs_branded_vpn;
			} else {
			footerIconId = R.drawable.ic_qs_vpn;
			}
			}
	if (mFooterIconId != footerIconId) {		if (mFooterIconId != footerIconId) {
	mFooterIconId = footerIconId;		mFooterIconId = footerIconId;
	mMainHandler.post(mUpdateIcon);		mMainHandler.post(mUpdateIcon);