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

Commit a860731b authored by David Gross's avatar David Gross Committed by android-build-merger
Browse files

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

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

Change-Id: I8012d70740ad7cc41eec9f4eef9fead50b9c72ba
parents 3a6ac9a6 4095ac60
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>