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

Merge "Skip MTP launch notification for devices having FEATURE_AUTOMOTIVE." into nyc-dev

Browse Source
This commit is contained in:
Daichi Hirono
2016-03-10 01:35:27 +00:00
committed by Android (Google) Code Review
parent 0dd17c8406 f8a0c8536e
commit 05133ad090
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/usb/java/com/android/server/usb/MtpNotificationManager.java
View File

@@ -24,6 +24,7 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.usb.UsbConstants; import android.hardware.usb.UsbConstants;
import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDevice;
@@ -101,8 +102,8 @@ class MtpNotificationManager {
TAG, device.getDeviceId(), notification); TAG, device.getDeviceId(), notification);
} }
void hideNotification(UsbDevice device) { void hideNotification(int deviceId) {
mContext.getSystemService(NotificationManager.class).cancel(TAG, device.getDeviceId()); mContext.getSystemService(NotificationManager.class).cancel(TAG, deviceId);
} }
private class Receiver extends BroadcastReceiver { private class Receiver extends BroadcastReceiver {
@@ -121,7 +122,13 @@ class MtpNotificationManager {
} }
} }
static boolean isMtpDevice(UsbDevice device) { static boolean shouldShowNotification(PackageManager packageManager, UsbDevice device) {
// We don't show MTP notification for devices that has FEATURE_AUTOMOTIVE.
return !packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) &&
isMtpDevice(device);
}
private static boolean isMtpDevice(UsbDevice device) {
for (int i = 0; i < device.getInterfaceCount(); i++) { for (int i = 0; i < device.getInterfaceCount(); i++) {
final UsbInterface usbInterface = device.getInterface(i); final UsbInterface usbInterface = device.getInterface(i);
if ((usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE && if ((usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE &&

6
services/usb/java/com/android/server/usb/UsbSettingsManager.java
View File

@@ -738,7 +738,7 @@ class UsbSettingsManager {
// Send broadcast to running activity with registered intent // Send broadcast to running activity with registered intent
mUserContext.sendBroadcast(intent); mUserContext.sendBroadcast(intent);
if (MtpNotificationManager.isMtpDevice(device)) { if (MtpNotificationManager.shouldShowNotification(mPackageManager, device)) {
// Show notification if the device is MTP storage. // Show notification if the device is MTP storage.
mMtpNotificationManager.showNotification(device); mMtpNotificationManager.showNotification(device);
} else { } else {
@@ -769,9 +769,7 @@ class UsbSettingsManager {
if (DEBUG) Slog.d(TAG, "usbDeviceRemoved, sending " + intent); if (DEBUG) Slog.d(TAG, "usbDeviceRemoved, sending " + intent);
mContext.sendBroadcastAsUser(intent, UserHandle.ALL); mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
if (MtpNotificationManager.isMtpDevice(device)) { mMtpNotificationManager.hideNotification(device.getDeviceId());
mMtpNotificationManager.hideNotification(device);
}
} }
public void accessoryAttached(UsbAccessory accessory) { public void accessoryAttached(UsbAccessory accessory) {