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

Commit e5530ec0 authored by John Reck's avatar John Reck
Browse files

resolve merge conflicts of 32a95af0 to master. 

Change-Id: I35b7cea1d34cb24f431ba2b76433a5b0ef1cb602
parents 17b179d5 32a95af0

core/java/org/apache/http/conn/ssl/AbstractVerifier.java

+2 −2
Original line number Diff line number Diff line
@@ -208,8 +208,8 @@ public abstract class AbstractVerifier implements X509HostnameVerifier { 
    }



    public static String[] getCNs(X509Certificate cert) {

        DistinguishedNameParser dnParser =

                new DistinguishedNameParser(cert.getSubjectX500Principal());

        AndroidDistinguishedNameParser dnParser =

                new AndroidDistinguishedNameParser(cert.getSubjectX500Principal());

        List<String> cnList = dnParser.getAllMostSpecificFirst("cn");



        if(!cnList.isEmpty()) {

core/java/org/apache/http/conn/ssl/DistinguishedNameParser.java→core/java/org/apache/http/conn/ssl/AndroidDistinguishedNameParser.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import javax.security.auth.x500.X500Principal; 
 * @hide

 */

@Deprecated

final class DistinguishedNameParser {

final class AndroidDistinguishedNameParser {

    private final String dn;

    private final int length;

    private int pos;
@@ -42,7 +42,7 @@ final class DistinguishedNameParser { 
    /** distinguished name chars */

    private char[] chars;



    public DistinguishedNameParser(X500Principal principal) {

    public AndroidDistinguishedNameParser(X500Principal principal) {

        // RFC2253 is used to ensure we get attributes in the reverse

        // order of the underlying ASN.1 encoding, so that the most

        // significant values of repeated attributes occur first.

libs/hwui/OpenGLRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ void OpenGLRenderer::drawPatch(const SkBitmap* bitmap, const Patch* mesh, 


    Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap);

    if (!texture) return;

    const AutoTexture autoCleanup(texture);



    // 9 patches are built for stretching - always filter

    int textureFillFlags = TextureFillFlags::ForceFilter;

libs/hwui/renderstate/RenderState.cpp

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ void RenderState::render(const Glop& glop, const Matrix4& orthoMatrix) { 
    SkiaShader::apply(*mCaches, fill.skiaShaderData);



    GL_CHECKPOINT();

    Texture* texture = (fill.skiaShaderData.skiaShaderType & kBitmap_SkiaShaderType) ?

            fill.skiaShaderData.bitmapData.bitmapTexture : nullptr;

    const AutoTexture autoCleanup(texture);



    // ------------------------------------

    // ---------- GL state setup ----------