Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c384fdd authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge " UsbManager: Don't display activity picker if there are no apps...

Merge "    UsbManager: Don't display activity picker if there are no apps available for an accessory"
parents 570d2dfb 805b6bbe
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -669,8 +669,11 @@ class UsbDeviceSettingsManager {
            defaultPackage = mAccessoryPreferenceMap.get(new AccessoryFilter(accessory));
        }

        if (defaultPackage != null) {
        int count = matches.size();
        // don't show the resolver activity if there are no choices available
        if (count == 0) return;

        if (defaultPackage != null) {
            for (int i = 0; i < count; i++) {
                ResolveInfo rInfo = matches.get(i);
                if (rInfo.activityInfo != null &&