OSDN Git Service

Use device key to map device documents.
authorDaichi Hirono <hirono@google.com>
Sat, 6 Feb 2016 12:05:57 +0000 (21:05 +0900)
committerDaichi Hirono <hirono@google.com>
Wed, 17 Feb 2016 08:18:13 +0000 (08:18 +0000)
commitebd24051599280443435606cab220de33b9356ad
tree8440a0fe7e871346bf728e3b9be0f27543d31b26
parent7d37da7086fbd60477a70a9fec79ddc444dfe8b8
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)
12 files changed:
packages/MtpDocumentsProvider/src/com/android/mtp/Mapper.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDeviceRecord.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java
packages/MtpDocumentsProvider/src/com/android/mtp/RootScanner.java
packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpManagerTest.java
packages/MtpDocumentsProvider/tests/src/com/android/mtp/TestMtpManager.java