| f271c6d266f37d600b65ada8e4e4a32d5044a49a |
|
22-Dec-2016 |
Alex Klyubin <klyubin@google.com> |
resolve merge conflicts of b53d984 to master
Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26
|
| abdc2b47b3b6736e202663dee93f37e53f4e3ebf |
|
21-Dec-2016 |
Alex Klyubin <klyubin@google.com> |
Make users of MtpServer fill in DeviceInfo field values
This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.
Bug: 33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: I4e6696cdee18b9c3e987c432c095911e85a997db
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| d9291d55f6aa39a63311d7b1b6585f7a73aafd68 |
|
13-Dec-2016 |
Jerry Zhang <zhangjerry@google.com> |
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29
am: 11dc0eccfb
Change-Id: Ibafebe4877052595cb34626bde9ac6fba1983fb0
|
| bb598ee16f4b61978c88358e8f96153395cdb7ad |
|
24-Oct-2016 |
Jerry Zhang <zhangjerry@google.com> |
Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.
Functionfs requires MtpServer to write descriptors before the device can be
configured. This adds a new configure call that will occur only when
functions are changed (new argument added to updateUsbStateBroadcast for this)
and be called after sys.usb.config is changed but before the waitForState
call to ensure compatibility with configfs devices.
Bug: 30976142
Change-Id: I7e94a5847d3b19c0fd75139e1b15a3f2a1cea01d
Test: Manual
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| f1d69ee247e551210f5ee56908581c6e0aa10da8 |
|
07-Jul-2016 |
Daichi Hirono <hirono@google.com> |
Add onTerminate runner to MtpServer.
The CL adds onTerminate runner to MtpServer constructor's arguments to
know when MtpServer stops its thread.
BUG=29971895
Change-Id: I685ad6bc663f76e04ae3837129cbe12805d2093c
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| fe259319e6fb90188aea6529b5af6bffd90201e9 |
|
06-Apr-2016 |
Daichi Hirono <hirono@google.com> |
Close MTP database when MtpServer's thread is terminated.
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
(cherry picked from commit dd383597c4bd85044bcaf23f1f16489f2c059ae0)
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| dd383597c4bd85044bcaf23f1f16489f2c059ae0 |
|
06-Apr-2016 |
Daichi Hirono <hirono@google.com> |
Close MTP database when MtpServer's thread is terminated.
Fix: 28030321
Change-Id: I7efe59b651a62ca917ba74312a80b56c0564e060
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| 56c85244b9be0fc6f6c2baf5f9a53f2364d5ec5e |
|
07-Mar-2014 |
Mike Lockwood <lockwood@google.com> |
MTP: Add support for battery level device property
Bug: 7342482
Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| e2e59326f13cf291bf5b37989390fd2a55a94f0c |
|
17-Dec-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| dcc31946f2b78be4bf95b1cace2e2c211f027e72 |
|
11-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Clean up MtpServer initialization and threading:
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| 7d40d42a364f520da853b41956b0a18ed172491b |
|
21-Jun-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for PTP variant of GetDeviceInfo result.
Change-Id: I09f86fda768b7697665e401adb9516588859bf59
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| aa48835ce9a84d9d587d7a4b10ee6ea7c00e00ec |
|
08-Jun-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Remove obsolete setPtpMode support
PTP mode will be implemented as a separate USB function instead.
Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| b239b683765f63d79e74b8ba2a8cc2855f236536 |
|
05-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units
- Add storage_id column to media database for MTP storage ID
- Add framework resource for defining mount points and user visible descriptions
for multiple volumes
- Clean up locking in MtpServer JNI code
Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| a3f8514492cb4bc8fa7c36e2c0f720342796ada7 |
|
17-Mar-2011 |
Mike Lockwood <lockwood@android.com> |
MtpServer: Do not attempt to stop MTP if it has not been started
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.
Bug: 4118033
Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| 66e57f6aa9d206552e9b154bf00a17d6efae7fb0 |
|
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Disable MTP when the keyguard is locked and secure
BUG: 3402847
Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| 071b2b6739c83d3de806cda5d7be2aba33fde1af |
|
25-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix race conditions in MtpServer JNI code
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.
BUG: 3317803
Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| f26a586c86b097f975e26fe526ead564ad011bd0 |
|
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|
| 0cd0136d440cf6ad9d5fab430269116786e671ec |
|
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP Java classes to android.mtp.* package.
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/mtp/MtpServer.java
|