From 6997da71fb02ec2b2e5b797552a9174b86fc7c25 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 3 Apr 2017 15:22:54 -0400 Subject: [PATCH] Fix monkey crash Test: runtest systemui Change-Id: I6706a9e1bb7935d709f10c192f421fe1d321fe1d Fixes: 36779672 --- packages/SystemUI/src/com/android/systemui/qs/QSDetail.java | 2 +- .../tests/src/com/android/systemui/qs/QSDetailTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java index 9efe224ff52fd..d2a291944d8d0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java @@ -242,7 +242,7 @@ public class QSDetail extends LinearLayout { mDetailSettingsButton.setVisibility(settingsIntent != null ? VISIBLE : GONE); mDetailSettingsButton.setOnClickListener(v -> { Dependency.get(MetricsLogger.class).action(ACTION_QS_MORE_SETTINGS, - mDetailAdapter.getMetricsCategory()); + adapter.getMetricsCategory()); Dependency.get(ActivityStarter.class) .postStartActivityDismissingKeyguard(settingsIntent, 0); }); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java index c67cccc061690..8609eeb7e6b46 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java @@ -100,4 +100,10 @@ public class QSDetailTest extends SysuiTestCase { ViewUtils.detachView(mQsDetail); mTestableLooper.processAllMessages(); } + + @Test + public void testNullAdapterClick() { + mQsDetail.setupDetailFooter(mock(DetailAdapter.class)); + mQsDetail.findViewById(android.R.id.button2).performClick(); + } }