Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7ea82c authored by Robin Lee's avatar Robin Lee
Browse files

Profile owner hint in warning for extra CAs 

The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
parent bde7bc45

core/res/res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ 
         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.

         [CHAR LIMIT=100]-->

    <string name="ssl_ca_cert_noti_by_unknown">By an unknown third party</string>

    <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",

        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing

        the monitoring. [CHAR LIMIT=100]-->

    <string name="ssl_ca_cert_noti_by_administrator">By your work profile administrator</string>

    <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",

         i.e. "Network may be monitored". This indicates who is doing the monitoring.

         [CHAR LIMIT=100]-->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ 
  <java-symbol type="string" name="write_fail_reason_cancelled" />

  <java-symbol type="string" name="write_fail_reason_cannot_write" />

  <java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" />

  <java-symbol type="string" name="ssl_ca_cert_noti_by_administrator" />

  <java-symbol type="string" name="ssl_ca_cert_noti_managed" />

  <java-symbol type="string" name="ssl_ca_cert_warning" />

  <java-symbol type="string" name="work_profile_deleted" />

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -1694,7 +1694,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            int smallIconId;

            String contentText;

            final String ownerName = getDeviceOwnerName();

            if (ownerName != null) {

            if (isManagedProfile(userHandle.getIdentifier())) {

                contentText = mContext.getString(R.string.ssl_ca_cert_noti_by_administrator);

                smallIconId = R.drawable.stat_sys_certificate_info;

            } else if (ownerName != null) {

                contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, ownerName);

                smallIconId = R.drawable.stat_sys_certificate_info;

            } else {