ebd24051599280443435606cab220de33b9356ad - platform/frameworks/base

commit	ebd24051599280443435606cab220de33b9356ad	[log] [tgz]
author	Daichi Hirono <hirono@google.com>	Sat Feb 06 21:05:57 2016 +0900
committer	Daichi Hirono <hirono@google.com>	Wed Feb 17 08:18:13 2016 +0000
tree	8440a0fe7e871346bf728e3b9be0f27543d31b26
parent	7d37da7086fbd60477a70a9fec79ddc444dfe8b8 [diff]

Use device key to map device documents.

The CL introduces MAPPING_KEY column to the database and lets Mapper use
the column to map IDs of devices.

It also removes the concept of mapping mode from Mapper for
simplyfing. Now Mapper just tries to multiple mapping keys (MTP
identifier, display name, and mapping key) to find candidate of ID
mapping.

BUG=26212981

Change-Id: I19f6c7dac146047e9978de4eb33d5076406037ad
(cherry picked from commit 637a2010f4a0c0484b13c4cb87aa2858bdf079b2)

packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDeviceRecord.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java[diff]
packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java[diff]
packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java[diff]
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java[diff]
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java[diff]
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java[diff]
packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java[diff]

12 files changed

tree: 8440a0fe7e871346bf728e3b9be0f27543d31b26