summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-07-06 07:59:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-06 07:59:47 -0700
commit2776f6975d135a2eb5ae043f5ef6a4faa14ab520 (patch)
tree00e2760d14a838294ec028a2c2f21c231bedbfa7 /services
parenta2e66343b605e76b825ca4df74da0c782b7eb718 (diff)
parentc50bff85281fa9661310465e88fd62890ccc9240 (diff)
downloadframeworks_base-2776f6975d135a2eb5ae043f5ef6a4faa14ab520.zip
frameworks_base-2776f6975d135a2eb5ae043f5ef6a4faa14ab520.tar.gz
frameworks_base-2776f6975d135a2eb5ae043f5ef6a4faa14ab520.tar.bz2
Merge "UsbService: USB connected notification now redirects to USB screen in Settings"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/usb/UsbDeviceManager.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java
index 13a76b3..c157cf1 100644
--- a/services/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/java/com/android/server/usb/UsbDeviceManager.java
@@ -530,11 +530,12 @@ public class UsbDeviceManager {
notification.sound = null;
notification.vibrate = null;
- Intent intent = new Intent();
+ Intent intent = new Intent(
+ Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
- intent.setClassName("com.android.systemui",
- "com.android.systemui.usb.UsbPreferenceActivity");
+ intent.setComponent(new ComponentName("com.android.settings",
+ "com.android.settings.UsbSettings"));
PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0);
notification.setLatestEventInfo(mContext, title, message, pi);