diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5e70f189da833..7d3da4c5b4ada 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1282,6 +1282,9 @@ %1$s may monitor network traffic in your work profile + + Work profile network activity is visible to your IT admin + Network may be monitored diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 5e13fd345b814..2c5dbcd51f213 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -283,31 +283,17 @@ class QSSecurityFooter implements OnClickListener, DialogInterface.OnClickListen return mContext.getString(R.string.quick_settings_disclosure_named_vpn, vpnName); } + if (hasWorkProfile && isNetworkLoggingEnabled) { + return mContext.getString( + R.string.quick_settings_disclosure_managed_profile_network_activity); + } if (isProfileOwnerOfOrganizationOwnedDevice) { - if (isNetworkLoggingEnabled) { - if (organizationName == null) { - return mContext.getString( - R.string.quick_settings_disclosure_management_monitoring); - } - return mContext.getString( - R.string.quick_settings_disclosure_named_management_monitoring, - organizationName); - } if (workProfileOrganizationName == null) { return mContext.getString(R.string.quick_settings_disclosure_management); } return mContext.getString(R.string.quick_settings_disclosure_named_management, workProfileOrganizationName); } - if (hasWorkProfile && isNetworkLoggingEnabled) { - if (workProfileOrganizationName == null) { - return mContext.getString( - R.string.quick_settings_disclosure_managed_profile_monitoring); - } - return mContext.getString( - R.string.quick_settings_disclosure_named_managed_profile_monitoring, - workProfileOrganizationName); - } return null; }