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

Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev

Browse Source
This commit is contained in:
Geoffrey Pitsch
2017-04-25 13:38:45 +00:00
committed by Android (Google) Code Review
parent a31f49a0df 8c8dbdef5f
commit 390cdab47c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/NotificationInfo.java
View File

@@ -262,17 +262,15 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
private boolean hasImportanceChanged() {
return mSingleNotificationChannel != null &&
mChannelEnabledSwitch != null &&
mStartingUserImportance != getSelectedImportance();
}
private void saveImportance() {
if (mSingleNotificationChannel == null) {
return;
}
int selectedImportance = getSelectedImportance();
if (selectedImportance == mStartingUserImportance) {
if (!hasImportanceChanged()) {
return;
}
final int selectedImportance = getSelectedImportance();
MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE,
selectedImportance - mStartingUserImportance);
mSingleNotificationChannel.setImportance(selectedImportance);
@@ -386,7 +384,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
@Override
public boolean willBeRemoved() {
return !mChannelEnabledSwitch.isChecked();
return mChannelEnabledSwitch != null && !mChannelEnabledSwitch.isChecked();
}
@Override

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationInfoTest.java
View File

@@ -778,4 +778,9 @@ public class NotificationInfoTest extends SysuiTestCase {
enabledSwitch.setChecked(true);
assertEquals(View.VISIBLE, settingsLink.getVisibility());
}
@Test
public void testWillBeRemovedReturnsFalseBeforeBind() throws Exception {
assertFalse(mNotificationInfo.willBeRemoved());
}
}