Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b13581a9 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 1110748b: DO NOT MERGE: USB accessory support library 

* commit '1110748b':
  DO NOT MERGE: USB accessory support library
parents 7866be2b 1110748b

data/etc/android.hardware.usb.accessory.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,6 @@ 
<!-- This is the standard feature indicating that the device supports USB accessories. -->

<!-- This is the standard feature indicating that the device supports USB accessories. -->

<permissions>

<permissions>

    <feature name="android.hardware.usb.accessory" />

    <feature name="android.hardware.usb.accessory" />

    <library name="com.android.future.usb.accessory"

            file="/system/framework/com.android.future.usb.accessory.jar" />

</permissions>
 
</permissions>

libs/usb/Android.mk

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under,src)



LOCAL_MODULE_TAGS := optional



LOCAL_MODULE:= com.android.future.usb.accessory



include $(BUILD_JAVA_LIBRARY)

libs/usb/src/com/google/android/usb/UsbAccessory.java→libs/usb/src/com/android/future/usb/UsbAccessory.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.google.android.usb;

package com.android.future.usb;





/**

/**

 * A class representing a USB accessory.

 * A class representing a USB accessory.

libs/usb/src/com/google/android/usb/UsbManager.java→libs/usb/src/com/android/future/usb/UsbManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

 */









package com.google.android.usb;

package com.android.future.usb;





import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

libs/usb/tests/AccessoryChat/Android.mk

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
#

# 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.

#



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_PACKAGE_NAME := AccessoryChatGB



LOCAL_JAVA_LIBRARIES := com.android.future.usb.accessory



# Force an old SDK version to make sure we aren't using newer UsbManager APIs

LOCAL_SDK_VERSION := 8



include $(BUILD_PACKAGE)