am 9064a48: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity"

Mike Lockwood · Android Git Automerger · commit f02354e208ec · 2012-08-13T20:42:42.000-07:00
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
diff --git a/services/java/com/android/server/usb/UsbSettingsManager.java b/services/java/com/android/server/usb/UsbSettingsManager.java
@@ -545,6 +545,10 @@ public void deviceAttached(UsbDevice device) {
             defaultPackage = mDevicePreferenceMap.get(new DeviceFilter(device));
         }
 
+        // Send broadcast to running activity with registered intent
+        mContext.sendBroadcast(intent);
+
+        // Start activity with registered intent
         resolveActivity(intent, matches, defaultPackage, device, null);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,10 @@ public void deviceAttached(UsbDevice device) {`
`545`	`545`	`defaultPackage = mDevicePreferenceMap.get(new DeviceFilter(device));`
`546`	`546`	`}`
`547`	`547`
	`548`	`+ // Send broadcast to running activity with registered intent`
	`549`	`+ mContext.sendBroadcast(intent);`
	`550`	`+`
	`551`	`+ // Start activity with registered intent`
`548`	`552`	`resolveActivity(intent, matches, defaultPackage, device, null);`
`549`	`553`	`}`
`550`	`554`