Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e88dbc9d authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

Set Root.FLAG_LOCAL_ONLY for MTP roots. am: b7573e93 

am: d590e335

Change-Id: I68df97198ecbd7e7bdbcdb9e678f80266b5eb887
parents 333fdc8d d590e335

packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ class MtpDatabase { 
    }



    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)) {

            rootFlag |= Root.FLAG_SUPPORTS_CREATE;

        }

packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ public class MtpDatabaseTest extends AndroidTestCase { 
            cursor.moveToNext();

            assertEquals(1, getInt(cursor, Root.COLUMN_ROOT_ID));

            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));

            assertEquals(R.drawable.ic_root_mtp, getInt(cursor, Root.COLUMN_ICON));

            assertEquals("Device Storage", getString(cursor, Root.COLUMN_TITLE));

packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java

+13 −4
Original line number Diff line number Diff line
@@ -210,7 +210,11 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { 
            assertEquals(2, cursor.getCount());

            cursor.moveToNext();

            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("Device A Storage A", cursor.getString(3));

            assertEquals("1", cursor.getString(4));
@@ -225,7 +229,8 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { 
            cursor.moveToNext();

            cursor.moveToNext();

            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("Device B Storage B", cursor.getString(3));

            assertEquals("2", cursor.getString(4));
@@ -271,7 +276,9 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { 


            cursor.moveToNext();

            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("Device A", cursor.getString(3));

            assertEquals("1", cursor.getString(4));
@@ -279,7 +286,9 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { 


            cursor.moveToNext();

            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("Device B Storage B", cursor.getString(3));

            assertEquals("2", cursor.getString(4));