6d319b8aaa
The current model for setting up a functionfs function is: UsbDeviceManager#setCurrentFunctions() -> intent is sent to MtpReceiver to write the descriptors -> init/hal waits for descriptors to write, then pulls up gadget -> Gadget is configured, a USB_STATE intent starts MtpServer The main downside of this is a lack of reliability because the Mtp process could be killed at any point. Normally, a gadget is unbound if its control endpoint is closed. no_disconnect works around this, but is still a little janky. In addition, the extra intent delays the startup of the gadget. With the new model, UsbDeviceManager writes the descriptors on initialization. Since it is a system service, it won't be killed. UsbDeviceManager#setCurrentFunctions() -> init/hal pulls up gadget -> Gadget is configured, a USB_STATE intent starts MtpServer MtpServer calls UsbManager#getControlFd to get a dup of the control endpoint. Also modify permissions so system server can access mtp files. Bug: 72877174 Test: Change usb configurations to ptp/mtp Change-Id: Id17d2b5930f4e1f37ec1b4f00add9d594174ad49
113 lines
3.4 KiB
Java
113 lines
3.4 KiB
Java
/*
|
|
* Copyright (C) 2010 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.
|
|
*/
|
|
|
|
package android.mtp;
|
|
|
|
import com.android.internal.util.Preconditions;
|
|
|
|
import java.io.FileDescriptor;
|
|
|
|
/**
|
|
* Java wrapper for MTP/PTP support as USB responder.
|
|
* {@hide}
|
|
*/
|
|
public class MtpServer implements Runnable {
|
|
|
|
private long mNativeContext; // accessed by native methods
|
|
private final MtpDatabase mDatabase;
|
|
private final Runnable mOnTerminate;
|
|
|
|
static {
|
|
System.loadLibrary("media_jni");
|
|
}
|
|
|
|
public MtpServer(
|
|
MtpDatabase database,
|
|
FileDescriptor controlFd,
|
|
boolean usePtp,
|
|
Runnable onTerminate,
|
|
String deviceInfoManufacturer,
|
|
String deviceInfoModel,
|
|
String deviceInfoDeviceVersion,
|
|
String deviceInfoSerialNumber) {
|
|
mDatabase = Preconditions.checkNotNull(database);
|
|
mOnTerminate = Preconditions.checkNotNull(onTerminate);
|
|
native_setup(
|
|
database,
|
|
controlFd,
|
|
usePtp,
|
|
deviceInfoManufacturer,
|
|
deviceInfoModel,
|
|
deviceInfoDeviceVersion,
|
|
deviceInfoSerialNumber);
|
|
database.setServer(this);
|
|
}
|
|
|
|
public void start() {
|
|
Thread thread = new Thread(this, "MtpServer");
|
|
thread.start();
|
|
}
|
|
|
|
@Override
|
|
public void run() {
|
|
native_run();
|
|
native_cleanup();
|
|
mDatabase.close();
|
|
mOnTerminate.run();
|
|
}
|
|
|
|
public void sendObjectAdded(int handle) {
|
|
native_send_object_added(handle);
|
|
}
|
|
|
|
public void sendObjectRemoved(int handle) {
|
|
native_send_object_removed(handle);
|
|
}
|
|
|
|
public void sendDevicePropertyChanged(int property) {
|
|
native_send_device_property_changed(property);
|
|
}
|
|
|
|
public void addStorage(MtpStorage storage) {
|
|
native_add_storage(storage);
|
|
}
|
|
|
|
public void removeStorage(MtpStorage storage) {
|
|
native_remove_storage(storage.getStorageId());
|
|
}
|
|
|
|
public static void configure(boolean usePtp) {
|
|
native_configure(usePtp);
|
|
}
|
|
|
|
public static native final void native_configure(boolean usePtp);
|
|
private native final void native_setup(
|
|
MtpDatabase database,
|
|
FileDescriptor controlFd,
|
|
boolean usePtp,
|
|
String deviceInfoManufacturer,
|
|
String deviceInfoModel,
|
|
String deviceInfoDeviceVersion,
|
|
String deviceInfoSerialNumber);
|
|
private native final void native_run();
|
|
private native final void native_cleanup();
|
|
private native final void native_send_object_added(int handle);
|
|
private native final void native_send_object_removed(int handle);
|
|
private native final void native_send_device_property_changed(int property);
|
|
private native final void native_add_storage(MtpStorage storage);
|
|
private native final void native_remove_storage(int storageId);
|
|
}
|