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

Commit 1b6d890f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Initialize MD5 in logging in background am: e362e501 

am: 38c7928a

* commit '38c7928a':
  Initialize MD5 in logging in background
parents b40a3ad9 38c7928a

telecomm/java/android/telecom/Log.java

+27 −8
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package android.telecom;

package android.telecom;





import android.os.AsyncTask;



import java.security.MessageDigest;

import java.security.MessageDigest;

import java.security.NoSuchAlgorithmException;

import java.security.NoSuchAlgorithmException;

import java.util.IllegalFormatException;

import java.util.IllegalFormatException;
@@ -38,8 +40,26 @@ final public class Log { 
    public static final boolean WARN = isLoggable(android.util.Log.WARN);

    public static final boolean WARN = isLoggable(android.util.Log.WARN);

    public static final boolean ERROR = isLoggable(android.util.Log.ERROR);

    public static final boolean ERROR = isLoggable(android.util.Log.ERROR);





    private static MessageDigest sMessageDigest;



    private Log() {}

    private Log() {}





    public static void initMd5Sum() {

        new AsyncTask<Void, Void, Void>() {

            @Override

            public Void doInBackground(Void... args) {

                MessageDigest md;

                try {

                    md = MessageDigest.getInstance("SHA-1");

                } catch (NoSuchAlgorithmException e) {

                    md = null;

                }

                sMessageDigest = md;

                return null;

            }

        }.execute();

    }



    public static boolean isLoggable(int level) {

    public static boolean isLoggable(int level) {

        return FORCE_LOGGING || android.util.Log.isLoggable(TAG, level);

        return FORCE_LOGGING || android.util.Log.isLoggable(TAG, level);

    }

    }
@@ -137,15 +157,14 @@ final public class Log { 
    }

    }





    private static String secureHash(byte[] input) {

    private static String secureHash(byte[] input) {

        MessageDigest messageDigest;

        if (sMessageDigest != null) {

        try {

            sMessageDigest.reset();

            messageDigest = MessageDigest.getInstance("SHA-1");

            sMessageDigest.update(input);

        } catch (NoSuchAlgorithmException e) {

            byte[] result = sMessageDigest.digest();

            return null;

        }

        messageDigest.update(input);

        byte[] result = messageDigest.digest();

            return encodeHex(result);

            return encodeHex(result);

        } else {

            return "Uninitialized SHA1";

        }

    }

    }





    private static String encodeHex(byte[] bytes) {

    private static String encodeHex(byte[] bytes) {

telecomm/java/android/telecom/TelecomManager.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -498,6 +498,7 @@ public class TelecomManager { 
            mContext = context;

            mContext = context;

        }

        }

        mTelecomServiceOverride = telecomServiceImpl;

        mTelecomServiceOverride = telecomServiceImpl;

        android.telecom.Log.initMd5Sum();

    }

    }





    /**

    /**