Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix monkey crash" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-05 15:55:37 +00:00
committed by Android (Google) Code Review
parent 1e943b3ef0 6997da71fb
commit c01dd791c3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
View File

@@ -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);
});

6
packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java
View File

@@ -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();
}
}