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

Commit 9fffd9a8 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "USB: minor cleanup work" into honeycomb-mr1

parents 87584f51 62cfeeb8

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -113283,7 +113283,7 @@ 
<parameter name="objectHandle" type="int">

</parameter>

</method>

<method name="getStorageID"

<method name="getStorageId"

 return="long"

 abstract="false"

 native="false"

core/java/android/hardware/usb/IUsbManager.aidl

+3 −3
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ interface IUsbManager 
    /* Sets the default package for a USB device

     * (or clears it if the package name is null)

     */

    oneway void setDevicePackage(in UsbDevice device, String packageName);

    void setDevicePackage(in UsbDevice device, String packageName);



    /* Sets the default package for a USB device

    /* Sets the default package for a USB accessory

     * (or clears it if the package name is null)

     */

    void setAccessoryPackage(in UsbAccessory accessory, String packageName);
@@ -80,5 +80,5 @@ interface IUsbManager 
    boolean hasDefaults(String packageName);



    /* Clears default preferences and permissions for the package */

    oneway void clearDefaults(String packageName);

    void clearDefaults(String packageName);

}

core/java/android/hardware/usb/UsbManager.java

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ public class UsbManager { 
     * This may result in a system dialog being displayed to the user

     * if permission had not already been granted.

     * Success or failure is returned via the {@link android.app.PendingIntent} pi.

     * If successful, this grants the caller permission to access the device only

     * If successful, this grants the caller permission to access the accessory only

     * until the device is disconnected.

     *

     * The following extras will be added to pi:

libs/usb/Android.mk

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2008 The Android Open Source Project

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

libs/usb/tests/AccessoryChat/Android.mk

+16 −0
Original line number 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)