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

Commit 759445c5 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

resolved conflicts for merge of c53ad4cd to jb-mr2-dev 

Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
parents 754bf6ab c53ad4cd

media/java/android/media/AudioService.java

+43 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ import android.content.res.XmlResourceParser; 
import android.database.ContentObserver;

import android.media.MediaPlayer.OnCompletionListener;

import android.media.MediaPlayer.OnErrorListener;

import android.net.http.CertificateChainValidator;

import android.net.http.SslError;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;
@@ -79,10 +81,12 @@ import com.android.internal.util.XmlUtils; 


import org.xmlpull.v1.XmlPullParserException;



import java.io.ByteArrayInputStream;

import java.io.FileDescriptor;

import java.io.IOException;

import java.io.PrintWriter;

import java.lang.reflect.Field;

import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.concurrent.ConcurrentHashMap;

import java.util.HashMap;
@@ -113,6 +117,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
    protected static final boolean DEBUG_RC = false;

    /** Debug volumes */

    protected static final boolean DEBUG_VOL = false;

    /** Debug cert verification */

    private static final boolean DEBUG_CERTS = false;



    /** How long to delay before persisting a change in volume/ringer mode. */

    private static final int PERSIST_DELAY = 500;
@@ -6634,6 +6640,43 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
        pw.println(Integer.toHexString(mRingerModeMutedStreams));

    }



    public int verifyX509CertChain(int numcerts, byte [] chain, String domain, String authType) {



        if (DEBUG_CERTS) {

            Log.v(TAG, "java side verify for "

                    + numcerts + " certificates (" + chain.length + " bytes"

                            + ")for "+ domain + "/" + authType);

        }



        byte[][] certChain = new byte[numcerts][];



        ByteBuffer buf = ByteBuffer.wrap(chain);

        for (int i = 0; i < numcerts; i++) {

            int certlen = buf.getInt();

            if (DEBUG_CERTS) {

                Log.i(TAG, "cert " + i +": " + certlen);

            }

            certChain[i] = new byte[certlen];

            buf.get(certChain[i]);

        }



        try {

            SslError err = CertificateChainValidator.verifyServerCertificates(certChain,

                    domain, authType);

            if (DEBUG_CERTS) {

                Log.i(TAG, "verified: " + err);

            }

            if (err == null) {

                return -1;

            } else {

                return err.getPrimaryError();

            }

        } catch (Exception e) {

            Log.e(TAG, "failed to verify chain: " + e);

        }

        return SslError.SSL_INVALID;

    }



    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

media/java/android/media/IAudioService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.view.KeyEvent; 
 */

interface IAudioService {

    

    int verifyX509CertChain(int chainsize, in byte[] chain, String host, String authtype);



    void adjustVolume(int direction, int flags);



    oneway void adjustLocalOrRemoteStreamVolume(int streamType, int direction);