am ededdc6a: Merge "Avoid NPE" (bfe5c07f) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -380,6 +380,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
	requestIndicatorRedraw();		requestIndicatorRedraw();
	mStatistics.reset();		mStatistics.reset();
	checkForEmptyEditor();		checkForEmptyEditor();
			if (mFeedbackLogBuffer == null) {
			resetFeedbackLogging();
			}
	if (!isAllowedToLog()) {		if (!isAllowedToLog()) {
	// Log.w(TAG, "not in usability mode; not logging");		// Log.w(TAG, "not in usability mode; not logging");
	return;		return;
	@@ -413,9 +416,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
	}		}
	};		};
	}		}
	if (mFeedbackLogBuffer == null) {
	resetFeedbackLogging();
	}
	}		}

	private void resetFeedbackLogging() {		private void resetFeedbackLogging() {