Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService" (faa27f93) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Usb.java→core/java/android/hardware/UsbManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import java.io.IOException;
		* Class for accessing USB state information.
		* @hide
		*/
		public class Usb {
		public class UsbManager {
		/**
		* Broadcast Action: A broadcast for USB connected events.
		*

media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.hardware.Usb;
		import android.hardware.UsbManager;
		import android.net.Uri;

		public class DeviceDisconnectedReceiver extends BroadcastReceiver {
		@@ -33,7 +33,7 @@ public class DeviceDisconnectedReceiver extends BroadcastReceiver {
		mActivity = activity;
		mDeviceID = deviceID;

		IntentFilter filter = new IntentFilter(Usb.ACTION_USB_CAMERA_DETACHED);
		IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_CAMERA_DETACHED);
		filter.addDataScheme("content");
		activity.registerReceiver(this, filter);
		}

media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.camerabrowser;
		import android.content.Context;
		import android.content.Intent;
		import android.content.BroadcastReceiver;
		import android.hardware.Usb;
		import android.hardware.UsbManager;
		import android.net.Uri;
		import android.util.Log;

		@@ -30,7 +30,7 @@ public class UsbReceiver extends BroadcastReceiver
		@Override
		public void onReceive(Context context, Intent intent) {
		Log.d(TAG, "onReceive " + intent);
		if (Usb.ACTION_USB_CAMERA_ATTACHED.equals(intent.getAction())) {
		if (UsbManager.ACTION_USB_CAMERA_ATTACHED.equals(intent.getAction())) {
		Uri uri = intent.getData();
		intent = new Intent(context, StorageBrowser.class);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import android.content.DialogInterface.OnCancelListener;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.hardware.Usb;
		import android.hardware.UsbManager;
		import android.os.Bundle;
		import android.os.Environment;
		import android.os.Handler;
		@@ -82,7 +82,7 @@ public class UsbStorageActivity extends Activity
		private BroadcastReceiver mUsbStateReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(Usb.ACTION_USB_STATE)) {
		if (intent.getAction().equals(UsbManager.ACTION_USB_STATE)) {
		handleUsbStateChanged(intent);
		}
		}
		@@ -168,7 +168,7 @@ public class UsbStorageActivity extends Activity
		super.onResume();

		mStorageManager.registerListener(mStorageListener);
		registerReceiver(mUsbStateReceiver, new IntentFilter(Usb.ACTION_USB_STATE));
		registerReceiver(mUsbStateReceiver, new IntentFilter(UsbManager.ACTION_USB_STATE));
		try {
		mAsyncStorageHandler.post(new Runnable() {
		@Override
		@@ -192,7 +192,7 @@ public class UsbStorageActivity extends Activity
		}

		private void handleUsbStateChanged(Intent intent) {
		boolean connected = intent.getExtras().getBoolean(Usb.USB_CONNECTED);
		boolean connected = intent.getExtras().getBoolean(UsbManager.USB_CONNECTED);
		if (!connected) {
		// It was disconnected from the plug, so finish
		finish();

services/java/com/android/server/NotificationManagerService.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.hardware.Usb;
		import android.hardware.UsbManager;
		import android.media.AudioManager;
		import android.net.Uri;
		import android.os.Binder;
		@@ -326,13 +326,13 @@ public class NotificationManagerService extends INotificationManager.Stub

		boolean queryRestart = false;

		if (action.equals(Usb.ACTION_USB_STATE)) {
		if (action.equals(UsbManager.ACTION_USB_STATE)) {
		Bundle extras = intent.getExtras();
		boolean usbConnected = extras.getBoolean(Usb.USB_CONNECTED);
		boolean adbEnabled = (Usb.USB_FUNCTION_ENABLED.equals(
		extras.getString(Usb.USB_FUNCTION_ADB)));
		boolean usbConnected = extras.getBoolean(UsbManager.USB_CONNECTED);
		boolean adbEnabled = (UsbManager.USB_FUNCTION_ENABLED.equals(
		extras.getString(UsbManager.USB_FUNCTION_ADB)));
		updateAdbNotification(usbConnected && adbEnabled);
		} else if (action.equals(Usb.ACTION_USB_DISCONNECTED)) {
		} else if (action.equals(UsbManager.ACTION_USB_DISCONNECTED)) {
		updateAdbNotification(false);
		} else if (action.equals(Intent.ACTION_PACKAGE_REMOVED)
		\|\| action.equals(Intent.ACTION_PACKAGE_RESTARTED)
		@@ -435,7 +435,7 @@ public class NotificationManagerService extends INotificationManager.Stub

		// register for various Intents
		IntentFilter filter = new IntentFilter();
		filter.addAction(Usb.ACTION_USB_STATE);
		filter.addAction(UsbManager.ACTION_USB_STATE);
		filter.addAction(Intent.ACTION_SCREEN_ON);
		filter.addAction(Intent.ACTION_SCREEN_OFF);
		filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);