Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (054a87ae) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -357,9 +357,8 @@ public class StorageNotification extends SystemUI {
		final VolumeRecord rec = mStorageManager.findRecordByUuid(vol.getFsUuid());
		final DiskInfo disk = vol.getDisk();

		// Don't annoy when user dismissed in past. (But make sure the disk is adoptable; we
		// used to allow snoozing non-adoptable disks too.)
		if (rec.isSnoozed() && disk.isAdoptable()) {
		// Don't annoy when user dismissed in past.
		if (rec.isSnoozed() && (disk.isAdoptable() \|\| disk.isSd())) {
		return null;
		}

		@@ -398,8 +397,7 @@ public class StorageNotification extends SystemUI {
		if (disk.isUsb()) {
		builder.setOngoing(true);
		}
		// Non-adoptable disks can't be snoozed.
		if (disk.isAdoptable()) {
		if (disk.isAdoptable() \|\| disk.isSd()) {
		builder.setDeleteIntent(buildSnoozeIntent(vol.getFsUuid()));
		}