summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-05-09 17:27:50 -0700
committerNick Kralevich <nnk@google.com>2015-05-10 21:57:56 -0700
commitd9c7f2456957a5610cbbca1b2e31aa7b3574c50d (patch)
tree8690f53330ce2dfef5c1ced105bceb3ee5e83ac7 /core
parent1c86159142aa8b5d582cd53e1d16b874c99d3bc4 (diff)
downloadframeworks_base-d9c7f2456957a5610cbbca1b2e31aa7b3574c50d.zip
frameworks_base-d9c7f2456957a5610cbbca1b2e31aa7b3574c50d.tar.gz
frameworks_base-d9c7f2456957a5610cbbca1b2e31aa7b3574c50d.tar.bz2
UsbManager / UsbService / UsbDeviceManager: delete unused code
These functions are never called. Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
Diffstat (limited to 'core')
-rw-r--r--core/java/android/hardware/usb/IUsbManager.aidl3
-rw-r--r--core/java/android/hardware/usb/UsbManager.java37
2 files changed, 0 insertions, 40 deletions
diff --git a/core/java/android/hardware/usb/IUsbManager.aidl b/core/java/android/hardware/usb/IUsbManager.aidl
index 9bc967f..e4ab3f2 100644
--- a/core/java/android/hardware/usb/IUsbManager.aidl
+++ b/core/java/android/hardware/usb/IUsbManager.aidl
@@ -85,9 +85,6 @@ interface IUsbManager
/* Sets the current USB function. */
void setCurrentFunction(String function, boolean makeDefault);
- /* Sets the file path for USB mass storage backing file. */
- void setMassStorageBackingFile(String path);
-
/* Allow USB debugging from the attached host. If alwaysAllow is true, add the
* the public key to list of host keys that the user has approved.
*/
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java
index f283051..a45d4ca 100644
--- a/core/java/android/hardware/usb/UsbManager.java
+++ b/core/java/android/hardware/usb/UsbManager.java
@@ -410,28 +410,6 @@ public class UsbManager {
}
}
- private static boolean propertyContainsFunction(String property, String function) {
- String functions = SystemProperties.get(property, "");
- int index = functions.indexOf(function);
- if (index < 0) return false;
- if (index > 0 && functions.charAt(index - 1) != ',') return false;
- int charAfter = index + function.length();
- if (charAfter < functions.length() && functions.charAt(charAfter) != ',') return false;
- return true;
- }
-
- /**
- * Returns true if the specified USB function is currently enabled.
- *
- * @param function name of the USB function
- * @return true if the USB function is enabled.
- *
- * {@hide}
- */
- public boolean isFunctionEnabled(String function) {
- return propertyContainsFunction("sys.usb.config", function);
- }
-
/**
* Returns the current default USB function.
*
@@ -465,19 +443,4 @@ public class UsbManager {
Log.e(TAG, "RemoteException in setCurrentFunction", e);
}
}
-
- /**
- * Sets the file path for USB mass storage backing file.
- *
- * @param path backing file path
- *
- * {@hide}
- */
- public void setMassStorageBackingFile(String path) {
- try {
- mService.setMassStorageBackingFile(path);
- } catch (RemoteException e) {
- Log.e(TAG, "RemoteException in setDefaultFunction", e);
- }
- }
}