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

Commit 90cdbe26 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Add tests for handle methods in BluetoothMapContentObserver" am: 1bb06121 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2372348



Change-Id: Icd92502d12cafea2983a0a0cf3858bae1636be72
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d78e860e 1bb06121

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+16 −8
Original line number Diff line number Diff line
@@ -142,17 +142,20 @@ public class BluetoothMapContentObserver { 
    private int mMasId;

    private boolean mEnableSmsMms = false;

    private boolean mObserverRegistered = false;

    private BluetoothMapAccountItem mAccount;

    @VisibleForTesting

    BluetoothMapAccountItem mAccount;

    private String mAuthority = null;



    // Default supported feature bit mask is 0x1f

    private int mMapSupportedFeatures = BluetoothMapUtils.MAP_FEATURE_DEFAULT_BITMASK;

    // Default event report version is 1.0

    private int mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V10;

    @VisibleForTesting

    int mMapEventReportVersion = BluetoothMapUtils.MAP_EVENT_REPORT_V10;



    private BluetoothMapFolderElement mFolders = new BluetoothMapFolderElement("DUMMY", null);

    // Will be set by the MAS when generated.

    private Uri mMessageUri = null;

    @VisibleForTesting

    Uri mMessageUri = null;

    @VisibleForTesting

    Uri mContactUri = null;
@@ -1573,7 +1576,8 @@ public class BluetoothMapContentObserver { 
        }

    }



    private void handleMsgListChangesMms() {

    @VisibleForTesting

    void handleMsgListChangesMms() {

        if (V) {

            Log.d(TAG, "handleMsgListChangesMms");

        }
@@ -1583,9 +1587,11 @@ public class BluetoothMapContentObserver { 
        Cursor c;

        synchronized (getMsgListMms()) {

            if (mMapEventReportVersion == BluetoothMapUtils.MAP_EVENT_REPORT_V10) {

                c = mResolver.query(Mms.CONTENT_URI, MMS_PROJECTION_SHORT, null, null, null);

                c = BluetoothMethodProxy.getInstance().contentResolverQuery(mResolver,

                        Mms.CONTENT_URI, MMS_PROJECTION_SHORT, null, null, null);

            } else {

                c = mResolver.query(Mms.CONTENT_URI, MMS_PROJECTION_SHORT_EXT, null, null, null);

                c = BluetoothMethodProxy.getInstance().contentResolverQuery(mResolver,

                        Mms.CONTENT_URI, MMS_PROJECTION_SHORT_EXT, null, null, null);

            }



            try {
@@ -1741,7 +1747,8 @@ public class BluetoothMapContentObserver { 
        }

    }



    private void handleMsgListChangesMsg(Uri uri) throws RemoteException {

    @VisibleForTesting

    void handleMsgListChangesMsg(Uri uri) throws RemoteException {

        if (V) {

            Log.v(TAG, "handleMsgListChangesMsg uri: " + uri.toString());

        }
@@ -1854,7 +1861,8 @@ public class BluetoothMapContentObserver { 
                                        && sentFolder.getFolderId() == folderId

                                        && msg.localInitiatedSend) {

                                    if (msg.transparent) {

                                        mResolver.delete(

                                        BluetoothMethodProxy.getInstance().contentResolverDelete(

                                                mResolver,

                                                ContentUris.withAppendedId(mMessageUri, id), null,

                                                null);

                                    } else {

android/app/tests/unit/src/com/android/bluetooth/map/BluetoothMapContentObserverTest.java

+516 −58

File changed.

Preview size limit exceeded, changes collapsed.