Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add throws definition to MtpDevice#readEvent." into nyc-dev am: 4dfde6079c

Browse Source 
am: 80038a33e3

* commit '80038a33e3e938a37c0157b76f64aa1160e5b996':
  Add throws definition to MtpDevice#readEvent.

Change-Id: I8da27109f572398465793b2f484b84aab2cfcf5b
This commit is contained in:
Daichi Hirono
2016-04-22 00:17:19 +00:00
committed by android-build-merger
parent 8c46042510 80038a33e3
commit 8a24bfc7bc
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -23363,7 +23363,7 @@ package android.mtp {
method public boolean importFile(int, java.lang.String); method public boolean importFile(int, java.lang.String);
method public boolean importFile(int, android.os.ParcelFileDescriptor); method public boolean importFile(int, android.os.ParcelFileDescriptor);
method public boolean open(android.hardware.usb.UsbDeviceConnection); method public boolean open(android.hardware.usb.UsbDeviceConnection);
method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal); method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal) throws java.io.IOException;
method public boolean sendObject(int, long, android.os.ParcelFileDescriptor); method public boolean sendObject(int, long, android.os.ParcelFileDescriptor);
method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo); method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
} }

2
api/system-current.txt
View File

@@ -25099,7 +25099,7 @@ package android.mtp {
method public boolean importFile(int, java.lang.String); method public boolean importFile(int, java.lang.String);
method public boolean importFile(int, android.os.ParcelFileDescriptor); method public boolean importFile(int, android.os.ParcelFileDescriptor);
method public boolean open(android.hardware.usb.UsbDeviceConnection); method public boolean open(android.hardware.usb.UsbDeviceConnection);
method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal); method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal) throws java.io.IOException;
method public boolean sendObject(int, long, android.os.ParcelFileDescriptor); method public boolean sendObject(int, long, android.os.ParcelFileDescriptor);
method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo); method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
} }

2
api/test-current.txt
View File

@@ -23431,7 +23431,7 @@ package android.mtp {
method public boolean importFile(int, java.lang.String); method public boolean importFile(int, java.lang.String);
method public boolean importFile(int, android.os.ParcelFileDescriptor); method public boolean importFile(int, android.os.ParcelFileDescriptor);
method public boolean open(android.hardware.usb.UsbDeviceConnection); method public boolean open(android.hardware.usb.UsbDeviceConnection);
method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal); method public android.mtp.MtpEvent readEvent(android.os.CancellationSignal) throws java.io.IOException;
method public boolean sendObject(int, long, android.os.ParcelFileDescriptor); method public boolean sendObject(int, long, android.os.ParcelFileDescriptor);
method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo); method public android.mtp.MtpObjectInfo sendObjectInfo(android.mtp.MtpObjectInfo);
} }

14
media/java/android/mtp/MtpDevice.java
View File

@@ -16,6 +16,8 @@
package android.mtp; package android.mtp;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection; import android.hardware.usb.UsbDeviceConnection;
import android.os.CancellationSignal; import android.os.CancellationSignal;
@@ -329,13 +331,11 @@ public final class MtpDevice {
* *
* @param signal signal for cancellation * @param signal signal for cancellation
* @return obtained event * @return obtained event
* @throws IOException
*/ */
public MtpEvent readEvent(CancellationSignal signal) { public @NonNull MtpEvent readEvent(@Nullable CancellationSignal signal) throws IOException {
final int handle = native_submit_event_request(); final int handle = native_submit_event_request();
Preconditions.checkState(handle >= 0, "Other thread is reading an event.");
if (handle < 0) {
throw new IllegalStateException("Other thread is reading an event.");
}
if (signal != null) { if (signal != null) {
signal.setOnCancelListener(new CancellationSignal.OnCancelListener() { signal.setOnCancelListener(new CancellationSignal.OnCancelListener() {
@@ -391,8 +391,8 @@ public final class MtpDevice {
private native boolean native_import_file(int objectHandle, int fd); private native boolean native_import_file(int objectHandle, int fd);
private native boolean native_send_object(int objectHandle, long size, int fd); private native boolean native_send_object(int objectHandle, long size, int fd);
private native MtpObjectInfo native_send_object_info(MtpObjectInfo info); private native MtpObjectInfo native_send_object_info(MtpObjectInfo info);
private native int native_submit_event_request(); private native int native_submit_event_request() throws IOException;
private native MtpEvent native_reap_event_request(int handle); private native MtpEvent native_reap_event_request(int handle) throws IOException;
private native void native_discard_event_request(int handle); private native void native_discard_event_request(int handle);
private native long native_get_object_size_long(int handle, int format) throws IOException; private native long native_get_object_size_long(int handle, int format) throws IOException;
} }