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

Commit d9beafae authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

Merge \\"Merge \\\\"Delete simple reduction implementation.\\\\" am:...

Merge \\"Merge \\\\"Delete simple reduction implementation.\\\\" am: e8909dc0 am: 403aa6e3\\" into nyc-dev-plus-aosp am: 4095ac60
am: a860731b

Change-Id: I0da69ab120e86d6263bb4bbf8cea187dc0e9b8bf
parents 8a30e36e a860731b
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -737,7 +737,17 @@ JavaVM::AttachCurrentThread from <jni.h>.

  <li>The Work Mode setting controls access to work apps. When work mode is off the
  system launcher indicates work apps are unavailable by greying them out. Enabling
  work mode again restores normal behavior.
  work mode again restores normal behavior.</li>

  <li>When installing a PKCS #12 file containing a client certificate chain and
  the corresponding private key from Settings UI, the CA certificate in the
  chain is no longer installed to the trusted credentials storage. This does
  not affect the result of {@link android.security.KeyChain#getCertificateChain
  KeyChain.getCertificateChain()} when apps attempt to retrieve the client
  certificate chain later. If required, the CA certificate should be installed
  to the trusted credentials storage via Settings UI separately, with a
  DER-encoded format under a .crt or .cer file extension.
  </li>
</ul>

<p>