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

Merge "Don't restore notification channel if its sound is unavailable" into sc-dev

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2021-05-09 20:36:02 +00:00
committed by Android (Google) Code Review
parent e52318e0bf 6a5ca92e75
commit c4646c09ba
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/NotificationChannel.java
View File

@@ -260,6 +260,8 @@ public final class NotificationChannel implements Parcelable {
private boolean mDemoted = false; private boolean mDemoted = false;
private boolean mImportantConvo = false; private boolean mImportantConvo = false;
private long mDeletedTime = DEFAULT_DELETION_TIME_MS; private long mDeletedTime = DEFAULT_DELETION_TIME_MS;
// If the sound for this channel is missing, e.g. after restore.
private boolean mIsSoundMissing;
/** /**
* Creates a notification channel. * Creates a notification channel.
@@ -714,6 +716,13 @@ public final class NotificationChannel implements Parcelable {
return mSound; return mSound;
} }
/**
* @hide
*/
public boolean isSoundMissing() {
return mIsSoundMissing;
}
/** /**
* Returns the audio attributes for sound played by notifications posted to this channel. * Returns the audio attributes for sound played by notifications posted to this channel.
*/ */
@@ -998,8 +1007,9 @@ public final class NotificationChannel implements Parcelable {
// according to the docs because canonicalize method has to handle canonical uris as well. // according to the docs because canonicalize method has to handle canonical uris as well.
Uri canonicalizedUri = contentResolver.canonicalize(uri); Uri canonicalizedUri = contentResolver.canonicalize(uri);
if (canonicalizedUri == null) { if (canonicalizedUri == null) {
// We got a null because the uri in the backup does not exist here, so we return default // We got a null because the uri in the backup does not exist here.
return Settings.System.DEFAULT_NOTIFICATION_URI; mIsSoundMissing = true;
return null;
} }
return contentResolver.uncanonicalize(canonicalizedUri); return contentResolver.uncanonicalize(canonicalizedUri);
} }

3
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -330,7 +330,8 @@ public class PreferencesHelper implements RankingConfig {
} }
} }
if (isShortcutOk(channel) && isDeletionOk(channel)) { if (isShortcutOk(channel) && isDeletionOk(channel)
&& !channel.isSoundMissing()) {
r.channels.put(id, channel); r.channels.put(id, channel);
} }
} }

41
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -375,19 +375,27 @@ public class PreferencesHelperTest extends UiServiceTestCase {
when(mPm.getPackageUidAsUser(eq(packageName), anyInt())).thenReturn(uid); when(mPm.getPackageUidAsUser(eq(packageName), anyInt())).thenReturn(uid);
} }
private static NotificationChannel createNotificationChannel(String id, String name,
int importance) {
NotificationChannel channel = new NotificationChannel(id, name, importance);
channel.setSound(SOUND_URI, Notification.AUDIO_ATTRIBUTES_DEFAULT);
return channel;
}
@Test @Test
public void testWriteXml_onlyBackupsTargetUser() throws Exception { public void testWriteXml_onlyBackupsTargetUser() throws Exception {
// Setup package notifications. // Setup package notifications.
String package0 = "test.package.user0"; String package0 = "test.package.user0";
int uid0 = 1001; int uid0 = 1001;
setUpPackageWithUid(package0, uid0); setUpPackageWithUid(package0, uid0);
NotificationChannel channel0 = new NotificationChannel("id0", "name0", IMPORTANCE_HIGH); NotificationChannel channel0 = createNotificationChannel("id0", "name0", IMPORTANCE_HIGH);
assertTrue(mHelper.createNotificationChannel(package0, uid0, channel0, true, false)); assertTrue(mHelper.createNotificationChannel(package0, uid0, channel0, true, false));
String package10 = "test.package.user10"; String package10 = "test.package.user10";
int uid10 = 1001001; int uid10 = 1001001;
setUpPackageWithUid(package10, uid10); setUpPackageWithUid(package10, uid10);
NotificationChannel channel10 = new NotificationChannel("id10", "name10", IMPORTANCE_HIGH); NotificationChannel channel10 = createNotificationChannel("id10", "name10",
IMPORTANCE_HIGH);
assertTrue(mHelper.createNotificationChannel(package10, uid10, channel10, true, false)); assertTrue(mHelper.createNotificationChannel(package10, uid10, channel10, true, false));
ByteArrayOutputStream baos = writeXmlAndPurge(package10, uid10, true, 10); ByteArrayOutputStream baos = writeXmlAndPurge(package10, uid10, true, 10);
@@ -412,7 +420,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
String package0 = "test.package.user0"; String package0 = "test.package.user0";
int uid0 = 1001; int uid0 = 1001;
setUpPackageWithUid(package0, uid0); setUpPackageWithUid(package0, uid0);
NotificationChannel channel0 = new NotificationChannel("id0", "name0", IMPORTANCE_HIGH); NotificationChannel channel0 = createNotificationChannel("id0", "name0", IMPORTANCE_HIGH);
assertTrue(mHelper.createNotificationChannel(package0, uid0, channel0, true, false)); assertTrue(mHelper.createNotificationChannel(package0, uid0, channel0, true, false));
ByteArrayOutputStream baos = writeXmlAndPurge(package0, uid0, true, 0); ByteArrayOutputStream baos = writeXmlAndPurge(package0, uid0, true, 0);
@@ -505,9 +513,8 @@ public class PreferencesHelperTest extends UiServiceTestCase {
NotificationChannelGroup ncg = new NotificationChannelGroup("1", "bye"); NotificationChannelGroup ncg = new NotificationChannelGroup("1", "bye");
NotificationChannelGroup ncg2 = new NotificationChannelGroup("2", "hello"); NotificationChannelGroup ncg2 = new NotificationChannelGroup("2", "hello");
NotificationChannel channel1 = NotificationChannel channel1 =
new NotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH); createNotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH);
NotificationChannel channel2 = NotificationChannel channel2 = createNotificationChannel("id2", "name2", IMPORTANCE_LOW);
new NotificationChannel("id2", "name2", IMPORTANCE_LOW);
channel2.setDescription("descriptions for all"); channel2.setDescription("descriptions for all");
channel2.setSound(SOUND_URI, mAudioAttributes); channel2.setSound(SOUND_URI, mAudioAttributes);
channel2.enableLights(true); channel2.enableLights(true);
@@ -516,7 +523,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
channel2.enableVibration(false); channel2.enableVibration(false);
channel2.setGroup(ncg.getId()); channel2.setGroup(ncg.getId());
channel2.setLightColor(Color.BLUE); channel2.setLightColor(Color.BLUE);
NotificationChannel channel3 = new NotificationChannel("id3", "NAM3", IMPORTANCE_HIGH); NotificationChannel channel3 = createNotificationChannel("id3", "NAM3", IMPORTANCE_HIGH);
channel3.enableVibration(true); channel3.enableVibration(true);
mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, ncg, true); mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, ncg, true);
@@ -623,7 +630,8 @@ public class PreferencesHelperTest extends UiServiceTestCase {
} }
@Test @Test
public void testRestoreXml_withNonExistentCanonicalizedSoundUri() throws Exception { public void testRestoreXml_withNonExistentCanonicalizedSoundUri_ignoreChannel()
throws Exception {
Thread.sleep(3000); Thread.sleep(3000);
doReturn(null) doReturn(null)
.when(mTestIContentProvider).canonicalize(any(), eq(CANONICAL_SOUND_URI)); .when(mTestIContentProvider).canonicalize(any(), eq(CANONICAL_SOUND_URI));
@@ -641,7 +649,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
NotificationChannel actualChannel = mHelper.getNotificationChannel( NotificationChannel actualChannel = mHelper.getNotificationChannel(
PKG_N_MR1, UID_N_MR1, channel.getId(), false); PKG_N_MR1, UID_N_MR1, channel.getId(), false);
assertEquals(Settings.System.DEFAULT_NOTIFICATION_URI, actualChannel.getSound()); assertNull(actualChannel);
} }
@@ -650,7 +658,8 @@ public class PreferencesHelperTest extends UiServiceTestCase {
* handle its restore properly. * handle its restore properly.
*/ */
@Test @Test
public void testRestoreXml_withUncanonicalizedNonLocalSoundUri() throws Exception { public void testRestoreXml_withUncanonicalizedNonLocalSoundUri_ignoreChannel()
throws Exception {
// Not a local uncanonicalized uri, simulating that it fails to exist locally // Not a local uncanonicalized uri, simulating that it fails to exist locally
doReturn(null) doReturn(null)
.when(mTestIContentProvider).canonicalize(any(), eq(SOUND_URI)); .when(mTestIContentProvider).canonicalize(any(), eq(SOUND_URI));
@@ -669,7 +678,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
backupWithUncanonicalizedSoundUri.getBytes(), true, UserHandle.USER_SYSTEM); backupWithUncanonicalizedSoundUri.getBytes(), true, UserHandle.USER_SYSTEM);
NotificationChannel actualChannel = mHelper.getNotificationChannel(PKG_N_MR1, UID_N_MR1, id, false); NotificationChannel actualChannel = mHelper.getNotificationChannel(PKG_N_MR1, UID_N_MR1, id, false);
assertEquals(Settings.System.DEFAULT_NOTIFICATION_URI, actualChannel.getSound()); assertNull(actualChannel);
} }
@Test @Test
@@ -693,11 +702,11 @@ public class PreferencesHelperTest extends UiServiceTestCase {
NotificationChannelGroup ncg = new NotificationChannelGroup("1", "bye"); NotificationChannelGroup ncg = new NotificationChannelGroup("1", "bye");
NotificationChannelGroup ncg2 = new NotificationChannelGroup("2", "hello"); NotificationChannelGroup ncg2 = new NotificationChannelGroup("2", "hello");
NotificationChannel channel1 = NotificationChannel channel1 =
new NotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH); createNotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH);
NotificationChannel channel2 = NotificationChannel channel2 =
new NotificationChannel("id2", "name2", IMPORTANCE_HIGH); createNotificationChannel("id2", "name2", IMPORTANCE_HIGH);
NotificationChannel channel3 = NotificationChannel channel3 =
new NotificationChannel("id3", "name3", IMPORTANCE_LOW); createNotificationChannel("id3", "name3", IMPORTANCE_LOW);
channel3.setGroup(ncg.getId()); channel3.setGroup(ncg.getId());
mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, ncg, true); mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, ncg, true);
@@ -3048,7 +3057,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
@Test @Test
public void testChannelXml_backupDefaultApp() throws Exception { public void testChannelXml_backupDefaultApp() throws Exception {
NotificationChannel channel1 = NotificationChannel channel1 =
new NotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH); createNotificationChannel("id1", "name1", NotificationManager.IMPORTANCE_HIGH);
mHelper.createNotificationChannel(PKG_O, UID_O, channel1, true, false); mHelper.createNotificationChannel(PKG_O, UID_O, channel1, true, false);
@@ -3329,7 +3338,7 @@ public class PreferencesHelperTest extends UiServiceTestCase {
mAppOpsManager, mStatsEventBuilderFactory); mAppOpsManager, mStatsEventBuilderFactory);
mHelper.createNotificationChannel( mHelper.createNotificationChannel(
PKG_P, UID_P, new NotificationChannel("id", "id", 2), true, false); PKG_P, UID_P, createNotificationChannel("id", "id", 2), true, false);
mHelper.deleteNotificationChannel(PKG_P, UID_P, "id"); mHelper.deleteNotificationChannel(PKG_P, UID_P, "id");
NotificationChannel nc1 = mHelper.getNotificationChannel(PKG_P, UID_P, "id", true); NotificationChannel nc1 = mHelper.getNotificationChannel(PKG_P, UID_P, "id", true);
assertTrue(DateUtils.isToday(nc1.getDeletedTimeMs())); assertTrue(DateUtils.isToday(nc1.getDeletedTimeMs()));