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

Commit 36522e88 authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Show different strings when PO/DO user approves a cert" into nyc-dev

parents ffb10f81 71d1fed0

src/com/android/settings/MonitoringCertInfoActivity.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;





import com.android.settingslib.RestrictedLockUtils;



/**

/**

 * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network

 * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network

 * traffic. This activity should be launched for the user into which the CA cert is installed

 * traffic. This activity should be launched for the user into which the CA cert is installed
@@ -46,8 +48,10 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe 
        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);

        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);

        final int numberOfCertificates = getIntent().getIntExtra(

        final int numberOfCertificates = getIntent().getIntExtra(

                Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);

                Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);

        final CharSequence title = getResources().getQuantityText(

        final int titleId = RestrictedLockUtils.getProfileOrDeviceOwner(this, mUserId) != null

                R.plurals.ssl_ca_cert_dialog_title, numberOfCertificates);

                ? R.plurals.ssl_ca_cert_settings_button // Check certificate

                : R.plurals.ssl_ca_cert_dialog_title; // Trust or remove certificate

        final CharSequence title = getResources().getQuantityText(titleId, numberOfCertificates);

        setTitle(title);

        setTitle(title);





        final AlertDialog.Builder builder = new AlertDialog.Builder(this);

        final AlertDialog.Builder builder = new AlertDialog.Builder(this);

src/com/android/settings/TrustedCredentialsDialogBuilder.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import android.widget.Spinner; 




import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.TrustedCredentialsSettings.CertHolder;

import com.android.settings.TrustedCredentialsSettings.CertHolder;

import com.android.settingslib.RestrictedLockUtils;





import java.security.cert.X509Certificate;

import java.security.cert.X509Certificate;

import java.util.ArrayList;

import java.util.ArrayList;
@@ -221,10 +222,11 @@ class TrustedCredentialsDialogBuilder extends AlertDialog.Builder { 
                    && isUserSecure(certHolder.getUserId())

                    && isUserSecure(certHolder.getUserId())

                    && !mDpm.isCaCertApproved(certHolder.getAlias(), certHolder.getUserId());

                    && !mDpm.isCaCertApproved(certHolder.getAlias(), certHolder.getUserId());





            // The ok button is optional. User can still dismiss the dialog by other means.

            final boolean isProfileOrDeviceOwner = RestrictedLockUtils.getProfileOrDeviceOwner(

            // Display it only when trust button is not displayed, because we want users to

                    mActivity, certHolder.getUserId()) != null;

            // either remove or trust a CA cert when the cert is installed by DPC app.



            CharSequence displayText = mActivity.getText(mNeedsApproval

            // Show trust button only when it requires consumer user (non-PO/DO) to approve

            CharSequence displayText = mActivity.getText(!isProfileOrDeviceOwner && mNeedsApproval

                    ? R.string.trusted_credentials_trust_label

                    ? R.string.trusted_credentials_trust_label

                    : android.R.string.ok);

                    : android.R.string.ok);

            mPositiveButton = updateButton(DialogInterface.BUTTON_POSITIVE, displayText);

            mPositiveButton = updateButton(DialogInterface.BUTTON_POSITIVE, displayText);