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

Commit 3370dc82 authored by Kurt Partridge's avatar Kurt Partridge
Browse files

[Rlog2] ResearchLogging fix multi-space logging 

multi-space logging should look like single-space logging, missing a few minor log statements
(SuggestionUpdates, SetComposingText)

multi-project commit with I2af842348c2f2b8f7271ac5b63def245e83df24d

Change-Id: Icd3187c0d0377255f82787afffea657c14345803
parent 39b5396f

java/src/com/android/inputmethod/latin/RichInputConnection.java

+0 −3
Original line number Diff line number Diff line
@@ -368,9 +368,6 @@ public final class RichInputConnection { 
        // TextView flash the text for a second based on indices contained in the argument.

        if (null != mIC) {

            mIC.commitCorrection(correctionInfo);

            if (ProductionFlag.IS_EXPERIMENTAL) {

                ResearchLogger.richInputConnection_commitCorrection(correctionInfo);

            }

        }

        if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();

    }

java/src/com/android/inputmethod/research/LogUnit.java

+46 −26
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


package com.android.inputmethod.research;



import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.research.ResearchLogger.LogStatement;



import java.util.ArrayList;

import java.util.List;



/**
@@ -35,48 +36,54 @@ import java.util.List; 
 * been published recently, or whether the LogUnit contains numbers, etc.

 */

/* package */ class LogUnit {

    private final List<String[]> mKeysList;

    private final List<Object[]> mValuesList;

    private final ArrayList<LogStatement> mLogStatementList;

    private final ArrayList<Object[]> mValuesList;

    // Assume that mTimeList is sorted in increasing order.  Do not insert null values into

    // mTimeList.

    private final List<Long> mTimeList;

    private final List<Boolean> mIsPotentiallyPrivate;

    private final ArrayList<Long> mTimeList;

    private String mWord;

    private boolean mMayContainDigit;

    private boolean mIsPartOfMegaword;



    public LogUnit() {

        mKeysList = CollectionUtils.newArrayList();

        mValuesList = CollectionUtils.newArrayList();

        mTimeList = CollectionUtils.newArrayList();

        mIsPotentiallyPrivate = CollectionUtils.newArrayList();

        mLogStatementList = new ArrayList<LogStatement>();

        mValuesList = new ArrayList<Object[]>();

        mTimeList = new ArrayList<Long>();

        mIsPartOfMegaword = false;

    }



    private LogUnit(final List<String[]> keysList, final List<Object[]> valuesList,

            final List<Long> timeList, final List<Boolean> isPotentiallyPrivate) {

        mKeysList = keysList;

    private LogUnit(final ArrayList<LogStatement> logStatementList,

            final ArrayList<Object[]> valuesList,

            final ArrayList<Long> timeList,

            final boolean isPartOfMegaword) {

        mLogStatementList = logStatementList;

        mValuesList = valuesList;

        mTimeList = timeList;

        mIsPotentiallyPrivate = isPotentiallyPrivate;

        mIsPartOfMegaword = isPartOfMegaword;

    }



    /**

     * Adds a new log statement.  The time parameter in successive calls to this method must be

     * monotonically increasing, or splitByTime() will not work.

     */

    public void addLogStatement(final String[] keys, final Object[] values,

            final long time, final boolean isPotentiallyPrivate) {

        mKeysList.add(keys);

    public void addLogStatement(final LogStatement logStatement, final Object[] values,

            final long time) {

        mLogStatementList.add(logStatement);

        mValuesList.add(values);

        mTimeList.add(time);

        mIsPotentiallyPrivate.add(isPotentiallyPrivate);

    }



    public void publishTo(final ResearchLog researchLog, final boolean isIncludingPrivateData) {

        final int size = mKeysList.size();

        final int size = mLogStatementList.size();

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

            if (!mIsPotentiallyPrivate.get(i) || isIncludingPrivateData) {

                researchLog.outputEvent(mKeysList.get(i), mValuesList.get(i), mTimeList.get(i));

            final LogStatement logStatement = mLogStatementList.get(i);

            if (!isIncludingPrivateData && logStatement.mIsPotentiallyPrivate) {

                continue;

            }

            if (mIsPartOfMegaword && logStatement.mIsPotentiallyRevealing) {

                continue;

            }

            researchLog.outputEvent(mLogStatementList.get(i), mValuesList.get(i), mTimeList.get(i));

        }

    }
@@ -101,7 +108,7 @@ import java.util.List; 
    }



    public boolean isEmpty() {

        return mKeysList.isEmpty();

        return mLogStatementList.isEmpty();

    }



    /**
@@ -112,14 +119,27 @@ import java.util.List; 
        // Assume that mTimeList is in sorted order.

        final int length = mTimeList.size();

        for (int index = 0; index < length; index++) {

            if (mTimeList.get(index) >= maxTime) {

            if (mTimeList.get(index) > maxTime) {

                final List<LogStatement> laterLogStatements =

                        mLogStatementList.subList(index, length);

                final List<Object[]> laterValues = mValuesList.subList(index, length);

                final List<Long> laterTimes = mTimeList.subList(index, length);



                // Create the LogUnit containing the later logStatements and associated data.

                final LogUnit newLogUnit = new LogUnit(

                        mKeysList.subList(index, length),

                        mValuesList.subList(index, length),

                        mTimeList.subList(index, length),

                        mIsPotentiallyPrivate.subList(index, length));

                        new ArrayList<LogStatement>(laterLogStatements),

                        new ArrayList<Object[]>(laterValues),

                        new ArrayList<Long>(laterTimes),

                        true /* isPartOfMegaword */);

                newLogUnit.mWord = null;

                newLogUnit.mMayContainDigit = mMayContainDigit;



                // Purge the logStatements and associated data from this LogUnit.

                laterLogStatements.clear();

                laterValues.clear();

                laterTimes.clear();

                mIsPartOfMegaword = true;



                return newLogUnit;

            }

        }

java/src/com/android/inputmethod/research/MainLogBuffer.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class MainLogBuffer extends LogBuffer { 
                }

            } else {

                // Words not in the dictionary are a privacy threat.

                if (!(dictionary.isValidWord(word))) {

                if (ResearchLogger.hasLetters(word) && !(dictionary.isValidWord(word))) {

                    return false;

                }

            }

java/src/com/android/inputmethod/research/ResearchLog.java

+7 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.inputmethod.keyboard.Key; 
import com.android.inputmethod.latin.SuggestedWords;

import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.research.ResearchLogger.LogStatement;



import java.io.BufferedWriter;

import java.io.File;
@@ -207,14 +208,11 @@ public class ResearchLog { 
    private static final String UPTIME_KEY = "_ut";

    private static final String EVENT_TYPE_KEY = "_ty";



    void outputEvent(final String[] keys, final Object[] values, final long time) {

    void outputEvent(final LogStatement logStatement, final Object[] values, final long time) {

        // Not thread safe.

        if (keys.length == 0) {

            return;

        }

        if (DEBUG) {

            if (keys.length != values.length + 1) {

                Log.d(TAG, "Key and Value list sizes do not match. " + keys[0]);

            if (logStatement.mKeys.length != values.length) {

                Log.d(TAG, "Key and Value list sizes do not match. " + logStatement.mName);

            }

        }

        try {
@@ -226,10 +224,11 @@ public class ResearchLog { 
            mJsonWriter.beginObject();

            mJsonWriter.name(CURRENT_TIME_KEY).value(System.currentTimeMillis());

            mJsonWriter.name(UPTIME_KEY).value(time);

            mJsonWriter.name(EVENT_TYPE_KEY).value(keys[0]);

            mJsonWriter.name(EVENT_TYPE_KEY).value(logStatement.mName);

            final String[] keys = logStatement.mKeys;

            final int length = values.length;

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

                mJsonWriter.name(keys[i + 1]);

                mJsonWriter.name(keys[i]);

                Object value = values[i];

                if (value instanceof CharSequence) {

                    mJsonWriter.value(value.toString());

java/src/com/android/inputmethod/research/ResearchLogger.java

+265 −361

File changed.

Preview size limit exceeded, changes collapsed.