Merge "Stop showing ADB and MTP/PTP/USB notifications at the top."

Author: dsandler

services/java/com/android/server/NotificationManagerService.java

@@ -79,6 +79,7 @@ public class NotificationManagerService extends INotificationManager.Stub
     private static final long[] DEFAULT_VIBRATE_PATTERN = {0, 250, 250, 250};
 
     private static final int DEFAULT_STREAM_TYPE = AudioManager.STREAM_NOTIFICATION;
+    private static final boolean SCORE_ONGOING_HIGHER = false;
 
     final Context mContext;
     final IActivityManager mAm;
@@ -720,7 +721,7 @@ public void enqueueNotificationInternal(String pkg, int callingUid, int callingP
         // Migrate notification flags to scores
         if (0 != (notification.flags & Notification.FLAG_HIGH_PRIORITY)) {
             if (notification.priority < Notification.PRIORITY_MAX) notification.priority = Notification.PRIORITY_MAX;
-        } else if (0 != (notification.flags & Notification.FLAG_ONGOING_EVENT)) {
+        } else if (SCORE_ONGOING_HIGHER && 0 != (notification.flags & Notification.FLAG_ONGOING_EVENT)) {
             if (notification.priority < Notification.PRIORITY_HIGH) notification.priority = Notification.PRIORITY_HIGH;
         }
 

services/java/com/android/server/usb/UsbDeviceManager.java

@@ -591,6 +591,7 @@ private void updateUsbNotification() {
                     notification.defaults = 0; // please be quiet
                     notification.sound = null;
                     notification.vibrate = null;
+                    notification.priority = Notification.PRIORITY_MIN;
 
                     Intent intent = Intent.makeRestartActivityTask(
                             new ComponentName("com.android.settings",
@@ -624,6 +625,7 @@ private void updateAdbNotification() {
                     notification.defaults = 0; // please be quiet
                     notification.sound = null;
                     notification.vibrate = null;
+                    notification.priority = Notification.PRIORITY_MIN;
 
                     Intent intent = Intent.makeRestartActivityTask(
                             new ComponentName("com.android.settings",