diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-02 14:19:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 14:19:38 -0800 |
| commit | 403af5c688eedbe191e7900c1c315286807caf7c (patch) | |
| tree | 1bb8090c109cd6de047fcefad387f33f9a659986 /data | |
| parent | 4677c5118c29b5621ababc136b749f02a3d543d6 (diff) | |
| parent | b547fc297f24ce2d74fc86ef2a79a4424b6b4c59 (diff) | |
| download | frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.zip frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.tar.gz frameworks_base-403af5c688eedbe191e7900c1c315286807caf7c.tar.bz2 | |
Merge "Combine the USB accessory support library with the platform feature"
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/android.hardware.usb.accessory.xml | 2 | ||||
| -rw-r--r-- | data/etc/com.google.android.usb.xml | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/data/etc/android.hardware.usb.accessory.xml b/data/etc/android.hardware.usb.accessory.xml index 29df966..80a0904 100644 --- a/data/etc/android.hardware.usb.accessory.xml +++ b/data/etc/android.hardware.usb.accessory.xml @@ -17,4 +17,6 @@ <!-- This is the standard feature indicating that the device supports USB accessories. --> <permissions> <feature name="android.hardware.usb.accessory" /> + <library name="com.android.future.usb.accessory" + file="/system/framework/com.android.future.usb.accessory.jar" /> </permissions> diff --git a/data/etc/com.google.android.usb.xml b/data/etc/com.google.android.usb.xml deleted file mode 100644 index fae3d23..0000000 --- a/data/etc/com.google.android.usb.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<permissions> - <library name="com.google.android.usb" - file="/system/framework/com.google.android.usb.jar" /> -</permissions> |