Merge "Prevent Log.wtf crash in benign case" into nyc-dev am: e49ede4ed4

am: ed3a2ff1c3

* commit 'ed3a2ff1c352d5930844125622a7593cea5f749c':
  Prevent Log.wtf crash in benign case
This commit is contained in:
Adrian Roos
2016-03-15 23:37:31 +00:00
committed by android-build-merger

View File

@@ -166,7 +166,9 @@ public class FalsingManager implements SensorEventListener {
*/
public boolean isFalseTouch() {
if (FalsingLog.ENABLED) {
if (!mSessionActive) {
// We're getting some false wtfs from touches that happen after the device went
// to sleep. Only report missing sessions that happen when the device is interactive.
if (!mSessionActive && mContext.getSystemService(PowerManager.class).isInteractive()) {
FalsingLog.wtf("isFalseTouch", new StringBuilder()
.append("Session is not active, yet there's a query for a false touch.")
.append(" enabled=").append(isEnabled() ? 1 : 0)