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

Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-23 02:31:25 +00:00
committed by Android (Google) Code Review
parent 92b787bbf7 b7573e93cd
commit 5e252cecd1
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
View File

@@ -873,7 +873,7 @@ class MtpDatabase {
} }
private static int getRootFlags(int[] operationsSupported) { private static int getRootFlags(int[] operationsSupported) {
int rootFlag = Root.FLAG_SUPPORTS_IS_CHILD; int rootFlag = Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_LOCAL_ONLY;
if (MtpDeviceRecord.isWritingSupported(operationsSupported)) { if (MtpDeviceRecord.isWritingSupported(operationsSupported)) {
rootFlag |= Root.FLAG_SUPPORTS_CREATE; rootFlag |= Root.FLAG_SUPPORTS_CREATE;
} }

2
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
View File

@@ -128,7 +128,7 @@ public class MtpDatabaseTest extends AndroidTestCase {
cursor.moveToNext(); cursor.moveToNext();
assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID)); assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID));
assertEquals( assertEquals(
Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY,
getInt(cursor, Root.COLUMN_FLAGS)); getInt(cursor, Root.COLUMN_FLAGS));
assertEquals(R.drawable.ic_root_mtp, getInt(cursor, Root.COLUMN_ICON)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, Root.COLUMN_ICON));
assertEquals("Device Storage", getString(cursor, Root.COLUMN_TITLE)); assertEquals("Device Storage", getString(cursor, Root.COLUMN_TITLE));

17
packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
View File

@@ -210,7 +210,11 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
assertEquals(2, cursor.getCount()); assertEquals(2, cursor.getCount());
cursor.moveToNext(); cursor.moveToNext();
assertEquals("1", cursor.getString(0)); assertEquals("1", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(
Root.FLAG_SUPPORTS_IS_CHILD |
Root.FLAG_SUPPORTS_CREATE |
Root.FLAG_LOCAL_ONLY,
cursor.getInt(1));
assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device A Storage A", cursor.getString(3)); assertEquals("Device A Storage A", cursor.getString(3));
assertEquals("1", cursor.getString(4)); assertEquals("1", cursor.getString(4));
@@ -225,7 +229,8 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
cursor.moveToNext(); cursor.moveToNext();
cursor.moveToNext(); cursor.moveToNext();
assertEquals("2", cursor.getString(0)); assertEquals("2", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD, cursor.getInt(1)); assertEquals(
Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_LOCAL_ONLY, cursor.getInt(1));
assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device B Storage B", cursor.getString(3)); assertEquals("Device B Storage B", cursor.getString(3));
assertEquals("2", cursor.getString(4)); assertEquals("2", cursor.getString(4));
@@ -271,7 +276,9 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
cursor.moveToNext(); cursor.moveToNext();
assertEquals("1", cursor.getString(0)); assertEquals("1", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(
Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY,
cursor.getInt(1));
assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device A", cursor.getString(3)); assertEquals("Device A", cursor.getString(3));
assertEquals("1", cursor.getString(4)); assertEquals("1", cursor.getString(4));
@@ -279,7 +286,9 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
cursor.moveToNext(); cursor.moveToNext();
assertEquals("2", cursor.getString(0)); assertEquals("2", cursor.getString(0));
assertEquals(Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE, cursor.getInt(1)); assertEquals(
Root.FLAG_SUPPORTS_IS_CHILD | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_LOCAL_ONLY,
cursor.getInt(1));
assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2)); assertEquals(R.drawable.ic_root_mtp, cursor.getInt(2));
assertEquals("Device B Storage B", cursor.getString(3)); assertEquals("Device B Storage B", cursor.getString(3));
assertEquals("2", cursor.getString(4)); assertEquals("2", cursor.getString(4));