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

Commit b547fc29 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Combine the USB accessory support library with the platform feature 



Also renamed the support library to com.android.future.usb.accessory.jar

Change-Id: Id6226991ce73f75dfedc497adf1c25bffb670243
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 3dee21eb

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

+2 −0
Original line number Diff line number Diff line
@@ -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>

data/etc/com.google.android.usb.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?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>

libs/usb/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) 


LOCAL_MODULE_TAGS := optional



LOCAL_MODULE:= com.google.android.usb

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 Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.usb;

package com.android.future.usb;



/**

 * 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 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.Intent;