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

Add missing sound to important channels.

Browse Source 
Test: runtest systemui-notification
Change-Id: I7b091d312220e3830f2cd613b7ac08f75c5f0a8c
This commit is contained in:
Julia Reynolds
2017-02-22 12:18:45 -05:00
parent ad0d9e0157
commit 31b2baac8d
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/notification/RankingHelper.java
View File

@@ -32,6 +32,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ParceledListSlice;
import android.os.Build;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService.Ranking;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -516,6 +517,10 @@ public class RankingHelper implements RankingConfig {
if (!r.showBadge) {
channel.setShowBadge(false);
}
if (channel.getSound() == null) {
channel.setSound(Settings.System.DEFAULT_NOTIFICATION_URI,
Notification.AUDIO_ATTRIBUTES_DEFAULT);
}
r.channels.put(channel.getId(), channel);
updateConfig();
}

20
services/tests/notification/src/com/android/server/notification/RankingHelperTest.java
View File

@@ -775,6 +775,26 @@ public class RankingHelperTest {
mHelper.getNotificationChannel(pkg, uid, newChannel.getId(), false));
}
@Test
public void testCreateChannel_addMissingSound() throws Exception {
final NotificationChannel channel =
new NotificationChannel("id2", "name2", IMPORTANCE_LOW);
mHelper.createNotificationChannel(pkg, uid, channel, true);
assertNotNull(mHelper.getNotificationChannel(
pkg, uid, channel.getId(), false).getSound());
}
@Test
public void testCreateChannel_noOverrideSound() throws Exception {
Uri sound = new Uri.Builder().scheme("test").build();
final NotificationChannel channel = new NotificationChannel("id2", "name2",
NotificationManager.IMPORTANCE_DEFAULT);
channel.setSound(sound, mAudioAttributes);
mHelper.createNotificationChannel(pkg, uid, channel, true);
assertEquals(sound, mHelper.getNotificationChannel(
pkg, uid, channel.getId(), false).getSound());
}
@Test
public void testPermanentlyDeleteChannels() throws Exception {
NotificationChannel channel1 =