From c7652a82774f7587b7dacd2f9a38e7f428533855 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 27 Jul 2015 14:25:58 -0700 Subject: [PATCH] Fix AccessibilityEventLogger Change-Id: Ie936ccde6b7c93df4c125618ffdc46ce8b7633d8 --- .../AELogger.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename tests/AccessibilityEventsLogger/src/com/android/tests/{accessibilityeventslogger => accessibilityeventlogger}/AELogger.java (83%) diff --git a/tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventslogger/AELogger.java b/tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventlogger/AELogger.java similarity index 83% rename from tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventslogger/AELogger.java rename to tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventlogger/AELogger.java index 27d8eb9063eea..392c2a4cdfd78 100644 --- a/tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventslogger/AELogger.java +++ b/tests/AccessibilityEventsLogger/src/com/android/tests/accessibilityeventlogger/AELogger.java @@ -12,7 +12,7 @@ * the License. */ -package com.android.tests.accessibilityeventslogger; +package com.android.tests.accessibilityeventlogger; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; @@ -23,7 +23,7 @@ import android.widget.Toast; import java.util.Locale; public class AELogger extends AccessibilityService { - private static final String TAG = AELogger.class.getCanonicalName(); + private static final String TAG = AELogger.class.getSimpleName(); private static final int TOAST_EVENT_TYPES = AccessibilityEvent.TYPE_VIEW_CLICKED | AccessibilityEvent.TYPE_VIEW_LONG_CLICKED; @@ -42,8 +42,10 @@ public class AELogger extends AccessibilityService { @Override public void onAccessibilityEvent(AccessibilityEvent event) { - final String eventClass = event.getClassName().toString(); - final String eventText = String.valueOf(event.getText()).toLowerCase(Locale.getDefault()); + final String eventClass = event.getClassName() != null + ? event.getClassName().toString() : null; + final String eventText = event.getText() != null + ? String.valueOf(event.getText()).toLowerCase(Locale.getDefault()) : null; final String eventType = AccessibilityEvent.eventTypeToString(event.getEventType()); Log.d(TAG, String.format(