Merge "USB: minor cleanup work" into honeycomb-mr1
This commit is contained in:
committed by
Android (Google) Code Review
commit
9fffd9a8bb
@ -113283,7 +113283,7 @@
|
|||||||
<parameter name="objectHandle" type="int">
|
<parameter name="objectHandle" type="int">
|
||||||
</parameter>
|
</parameter>
|
||||||
</method>
|
</method>
|
||||||
<method name="getStorageID"
|
<method name="getStorageId"
|
||||||
return="long"
|
return="long"
|
||||||
abstract="false"
|
abstract="false"
|
||||||
native="false"
|
native="false"
|
||||||
|
@ -44,9 +44,9 @@ interface IUsbManager
|
|||||||
/* Sets the default package for a USB device
|
/* Sets the default package for a USB device
|
||||||
* (or clears it if the package name is null)
|
* (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)
|
* (or clears it if the package name is null)
|
||||||
*/
|
*/
|
||||||
void setAccessoryPackage(in UsbAccessory accessory, String packageName);
|
void setAccessoryPackage(in UsbAccessory accessory, String packageName);
|
||||||
@ -80,5 +80,5 @@ interface IUsbManager
|
|||||||
boolean hasDefaults(String packageName);
|
boolean hasDefaults(String packageName);
|
||||||
|
|
||||||
/* Clears default preferences and permissions for the package */
|
/* Clears default preferences and permissions for the package */
|
||||||
oneway void clearDefaults(String packageName);
|
void clearDefaults(String packageName);
|
||||||
}
|
}
|
||||||
|
@ -367,7 +367,7 @@ public class UsbManager {
|
|||||||
* This may result in a system dialog being displayed to the user
|
* This may result in a system dialog being displayed to the user
|
||||||
* if permission had not already been granted.
|
* if permission had not already been granted.
|
||||||
* Success or failure is returned via the {@link android.app.PendingIntent} pi.
|
* 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.
|
* until the device is disconnected.
|
||||||
*
|
*
|
||||||
* The following extras will be added to pi:
|
* The following extras will be added to pi:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# 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");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -1,3 +1,19 @@
|
|||||||
|
#
|
||||||
|
# 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)
|
LOCAL_PATH:= $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
@ -1,3 +1,19 @@
|
|||||||
|
<?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.
|
||||||
|
-->
|
||||||
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.android.accessorychat">
|
package="com.android.accessorychat">
|
||||||
|
|
||||||
|
@ -271,7 +271,7 @@ public final class MtpConstants {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if the object is abstract (that is, it has no representation
|
* Returns true if the object is abstract (that is, it has no representation
|
||||||
* in the underlying file system.
|
* in the underlying file system).
|
||||||
*
|
*
|
||||||
* @param format the format of the object
|
* @param format the format of the object
|
||||||
* @return true if the object is abstract
|
* @return true if the object is abstract
|
||||||
|
@ -198,7 +198,7 @@ public final class MtpDevice {
|
|||||||
* @param objectHandle handle of the object to query
|
* @param objectHandle handle of the object to query
|
||||||
* @return the object's storage unit ID
|
* @return the object's storage unit ID
|
||||||
*/
|
*/
|
||||||
public long getStorageID(int objectHandle) {
|
public long getStorageId(int objectHandle) {
|
||||||
return native_get_storage_id(objectHandle);
|
return native_get_storage_id(objectHandle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user