From 611af238185cf924a425a1a2154b8439b8f8d7a5 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 2 Mar 2011 21:53:39 -0800 Subject: [PATCH] DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory Change-Id: I1aa578887e42aef375211eadece4c1fddaf234f8 Signed-off-by: Mike Lockwood --- .../com/android/server/usb/UsbDeviceSettingsManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/usb/UsbDeviceSettingsManager.java b/services/java/com/android/server/usb/UsbDeviceSettingsManager.java index 07fb1cc1e15b1..0cb788e9df362 100644 --- a/services/java/com/android/server/usb/UsbDeviceSettingsManager.java +++ b/services/java/com/android/server/usb/UsbDeviceSettingsManager.java @@ -394,8 +394,11 @@ class UsbDeviceSettingsManager { defaultPackage = mAccessoryPreferenceMap.get(new AccessoryFilter(accessory)); } + int count = matches.size(); + // don't show the resolver activity if there are no choices available + if (count == 0) return; + if (defaultPackage != null) { - int count = matches.size(); for (int i = 0; i < count; i++) { ResolveInfo rInfo = matches.get(i); if (rInfo.activityInfo != null &&