summaryrefslogtreecommitdiff
path: root/services/usb/java
diff options
context:
space:
mode:
author Badhri Jagan Sridharan <Badhri@google.com> 2017-08-01 19:03:55 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-01 19:03:55 +0000
commitfb80072f9926ea74f2e957fc86eb935ac753e01d (patch)
tree7b67f7af115d8dc30d28fff32abac5ca5a5fbb33 /services/usb/java
parentc199e3fdf18e23774dd0d9f6837dca8c0dc579c9 (diff)
parent69840ca338347a1c2607d0f40d061c7be0e0c584 (diff)
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am: 69840ca338 Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b
Diffstat (limited to 'services/usb/java')
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 184dd73381ec..774bf438995c 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -1153,8 +1153,7 @@ public class UsbDeviceManager {
.usb_unsupported_audio_accessory_message);
}
- Notification notification =
- new Notification.Builder(mContext, channel)
+ Notification.Builder builder = new Notification.Builder(mContext, channel)
.setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
.setWhen(0)
.setOngoing(true)
@@ -1166,8 +1165,15 @@ public class UsbDeviceManager {
.setContentTitle(title)
.setContentText(message)
.setContentIntent(pi)
- .setVisibility(Notification.VISIBILITY_PUBLIC)
- .build();
+ .setVisibility(Notification.VISIBILITY_PUBLIC);
+
+ if (titleRes
+ == com.android.internal.R.string
+ .usb_unsupported_audio_accessory_title) {
+ builder.setStyle(new Notification.BigTextStyle()
+ .bigText(message));
+ }
+ Notification notification = builder.build();
mNotificationManager.notifyAsUser(null, id, notification,
UserHandle.ALL);