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

Merge "Re-enable throw when notifications posted can't find channel" into oc-dev

Browse Source 
am: 1af2928767

Change-Id: I9315cb5a2fde7e238ed4f90e9608c82565f582c8
This commit is contained in:
Geoffrey Pitsch
2017-03-29 15:41:55 +00:00
committed by android-build-merger
parent b51c04effb 1af2928767
commit 30d90c8fc0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -90,6 +90,7 @@ import android.media.AudioManagerInternal;
import android.media.IRingtonePlayer; import android.media.IRingtonePlayer;
import android.net.Uri; import android.net.Uri;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
@@ -3126,8 +3127,9 @@ public class NotificationManagerService extends SystemService {
+ ", incomingUserId=" + incomingUserId + ", incomingUserId=" + incomingUserId
+ ", notificationUid=" + notificationUid + ", notificationUid=" + notificationUid
+ ", notification=" + notification; + ", notification=" + notification;
// STOPSHIP TODO: should throw instead of logging. if (Build.IS_DEBUGGABLE) {
// throw new IllegalArgumentException(noChannelStr); throw new IllegalArgumentException(noChannelStr);
}
Log.e(TAG, noChannelStr); Log.e(TAG, noChannelStr);
return; return;
} }