Merge "Lock more of the things" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-09 19:56:25 +00:00
committed by Android (Google) Code Review
2 changed files with 451 additions and 377 deletions

View File

@@ -940,12 +940,12 @@ public class PreferencesHelperTest extends UiServiceTestCase {
@Test
public void testClearLockedFields() {
final NotificationChannel channel = getChannel();
mHelper.clearLockedFields(channel);
mHelper.clearLockedFieldsLocked(channel);
assertEquals(0, channel.getUserLockedFields());
channel.lockFields(NotificationChannel.USER_LOCKED_PRIORITY
| NotificationChannel.USER_LOCKED_IMPORTANCE);
mHelper.clearLockedFields(channel);
mHelper.clearLockedFieldsLocked(channel);
assertEquals(0, channel.getUserLockedFields());
}