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

Commit a21de582 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Prevent crash when a Browsable player has an empty root am: 1be84338 am: 170cf0cc 

Change-Id: Iecac2f6bba73d87b391f5ec5bed31d5bfd789d55
parents 64a71105 170cf0cc

android/app/res/values-pl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    <string name="not_exist_file_desc" msgid="4059531573790529229">"Plik nie istnieje. \n"</string>

    <string name="enabling_progress_title" msgid="436157952334723406">"Czekaj…"</string>

    <string name="enabling_progress_content" msgid="4601542238119927904">"Włączanie Bluetooth…"</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Plik zostanie odebrany. Sprawdzaj postęp w panelu powiadomień."</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Plik zostanie odebrany. Sprawdzaj postęp na panelu powiadomień."</string>

    <string name="bt_toast_2" msgid="8602553334099066582">"Nie można odebrać pliku."</string>

    <string name="bt_toast_3" msgid="6707884165086862518">"Zatrzymano odbiór pliku z urządzenia „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>

    <string name="bt_toast_4" msgid="4678812947604395649">"Wysyłanie pliku do urządzenia „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>

android/app/src/com/android/bluetooth/newavrcp/BrowsedPlayerWrapper.java

+9 −1
Original line number Diff line number Diff line
@@ -207,7 +207,15 @@ class BrowsedPlayerWrapper { 
            Log.i(TAG, "onConnected: " + mPackageName + " is connected");

            // Get the root while connected because we may need to use it when disconnected.

            mRoot = mWrappedBrowser.getRoot();

            if (mCallback != null) mCallback.run(STATUS_SUCCESS, BrowsedPlayerWrapper.this);



            if (mCallback == null) return;



            if (mRoot == null || mRoot.isEmpty()) {

                mCallback.run(STATUS_CONN_ERROR, BrowsedPlayerWrapper.this);

                return;

            }



            mCallback.run(STATUS_SUCCESS, BrowsedPlayerWrapper.this);

            mCallback = null;

        }

android/app/tests/unit/src/com/android/bluetooth/newavrcp/BrowserPlayerWrapperTest.java

+17 −0
Original line number Diff line number Diff line
@@ -87,6 +87,23 @@ public class BrowserPlayerWrapperTest { 
        verify(mMockBrowser, times(2)).disconnect();

    }



    @Test

    public void testEmptyRoot() {

        BrowsedPlayerWrapper wrapper = BrowsedPlayerWrapper.wrap(null, "test", "test");



        doReturn("").when(mMockBrowser).getRoot();



        wrapper.connect(mConnCb);

        verify(mMockBrowser).testInit(any(), any(), mBrowserConnCb.capture(), any());

        MediaBrowser.ConnectionCallback browserConnCb = mBrowserConnCb.getValue();



        verify(mMockBrowser, times(1)).connect();



        browserConnCb.onConnected();

        verify(mConnCb).run(eq(BrowsedPlayerWrapper.STATUS_CONN_ERROR), eq(wrapper));

        verify(mMockBrowser, times(1)).disconnect();

    }



    @Test

    public void testDisconnect() {

        BrowsedPlayerWrapper wrapper = BrowsedPlayerWrapper.wrap(null, "test", "test");