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

Commit 47bf64cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix BluetoothOppBatchTest unknown URI"

parents 6769e23f 7f445bbd

android/app/src/com/android/bluetooth/opp/Constants.java

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.Intent; 
import android.net.Uri;

import android.util.Log;



import com.android.bluetooth.BluetoothMethodProxy;

import com.android.obex.HeaderSet;



import java.io.IOException;
@@ -229,7 +230,8 @@ public class Constants { 
        Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/" + id);

        ContentValues updateValues = new ContentValues();

        updateValues.put(BluetoothShare.STATUS, status);

        context.getContentResolver().update(contentUri, updateValues, null, null);

        BluetoothMethodProxy.getInstance().contentResolverUpdate(context.getContentResolver(),

                contentUri, updateValues, null, null);

        Constants.sendIntentIfCompleted(context, contentUri, status);

    }

android/app/tests/unit/src/com/android/bluetooth/opp/BluetoothOppBatchTest.java

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ public class BluetoothOppBatchTest { 
        BluetoothMethodProxy proxy = spy(BluetoothMethodProxy.getInstance());

        BluetoothMethodProxy.setInstanceForTesting(proxy);

        doReturn(0).when(proxy).contentResolverDelete(any(), any(), any(), any());

        doReturn(0).when(proxy).contentResolverUpdate(any(), any(), any(), any(), any());



        assertThat(mBluetoothOppBatch.getPendingShare()).isEqualTo(mInitShareInfo);