PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add checks before casting entry.extraInfo."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-19 21:45:44 +00:00
committed by Android (Google) Code Review
parent 7686eb4f85 56966ce8f5
commit 6a74a151fd
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -1335,7 +1335,8 @@ public class ManageApplications extends InstrumentedFragment
private void updateSummary(ApplicationViewHolder holder, AppEntry entry) { private void updateSummary(ApplicationViewHolder holder, AppEntry entry) {
switch (mManageApplications.mListType) { switch (mManageApplications.mListType) {
case LIST_TYPE_NOTIFICATION: case LIST_TYPE_NOTIFICATION:
if (entry.extraInfo != null) { if (entry.extraInfo != null
&& entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext, holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
(NotificationsSentState) entry.extraInfo, (NotificationsSentState) entry.extraInfo,
(mLastSortMode == R.id.sort_order_recent_notification))); (mLastSortMode == R.id.sort_order_recent_notification)));
@@ -1384,7 +1385,8 @@ public class ManageApplications extends InstrumentedFragment
.getSwitchOnClickListener(entry), .getSwitchOnClickListener(entry),
AppStateNotificationBridge.enableSwitch(entry), AppStateNotificationBridge.enableSwitch(entry),
AppStateNotificationBridge.checkSwitch(entry)); AppStateNotificationBridge.checkSwitch(entry));
if (entry.extraInfo != null) { if (entry.extraInfo != null
&& entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext, holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
(NotificationsSentState) entry.extraInfo, (NotificationsSentState) entry.extraInfo,
(mLastSortMode == R.id.sort_order_recent_notification))); (mLastSortMode == R.id.sort_order_recent_notification)));

22
tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
View File

@@ -281,6 +281,28 @@ public class ManageApplicationsTest {
verify(adapter).notifyDataSetChanged(); verify(adapter).notifyDataSetChanged();
} }
@Test
public void applicationsAdapter_onBindViewHolder_notifications_wrongExtraInfo() {
when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{});
ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
mFragment.mListType = LIST_TYPE_NOTIFICATION;
ApplicationViewHolder holder = mock(ApplicationViewHolder.class);
ReflectionHelpers.setField(holder, "itemView", mock(View.class));
ManageApplications.ApplicationsAdapter adapter =
new ManageApplications.ApplicationsAdapter(mState,
mFragment, mock(AppFilterItem.class),
mock(Bundle.class));
final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
appEntry.info = mock(ApplicationInfo.class);
appEntry.extraInfo = mock(AppFilterItem.class);
appList.add(appEntry);
ReflectionHelpers.setField(adapter, "mEntries", appList);
adapter.onBindViewHolder(holder, 0);
// no crash? yay!
}
@Test @Test
public void applicationsAdapter_onBindViewHolder_updateSwitch_notifications() { public void applicationsAdapter_onBindViewHolder_updateSwitch_notifications() {
when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{}); when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{});