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

Commit 3f547adf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PBAP: Disable PBAP SIM Feature" am: b90274e5 

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



Change-Id: If9b1abaf9b282f4e447cb7dda6117dcaed35ba43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5e3bc85 b90274e5

android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java

+19 −8
Original line number Diff line number Diff line
@@ -101,6 +101,17 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
            "/telecom/och",

            "/telecom/mch",

            "/telecom/cch",

    };



    // Currently not support SIM card

    @SuppressWarnings("unused") private static final String[] LEGAL_PATH_WITH_SIM = {

            "/telecom",

            "/telecom/pb",

            "/telecom/fav",

            "/telecom/ich",

            "/telecom/och",

            "/telecom/mch",

            "/telecom/cch",

            "/SIM1",

            "/SIM1/telecom",

            "/SIM1/telecom/ich",
@@ -108,7 +119,6 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
            "/SIM1/telecom/mch",

            "/SIM1/telecom/cch",

            "/SIM1/telecom/pb"



    };



    // SIM card
@@ -463,23 +473,21 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
                appParamValue.needTag = ContentType.PHONEBOOK;

            } else if (mCurrentPath.equals(FAV_PATH)) {

                appParamValue.needTag = ContentType.FAVORITES;

            } else if (mCurrentPath.equals(ICH_PATH) || mCurrentPath.equals(SIM_ICH_PATH)) {

            } else if (mCurrentPath.equals(ICH_PATH)) {

                appParamValue.needTag = ContentType.INCOMING_CALL_HISTORY;

            } else if (mCurrentPath.equals(OCH_PATH)|| mCurrentPath.equals(SIM_OCH_PATH)) {

            } else if (mCurrentPath.equals(OCH_PATH)) {

                appParamValue.needTag = ContentType.OUTGOING_CALL_HISTORY;

            } else if (mCurrentPath.equals(MCH_PATH)|| mCurrentPath.equals(SIM_MCH_PATH)) {

            } else if (mCurrentPath.equals(MCH_PATH)) {

                appParamValue.needTag = ContentType.MISSED_CALL_HISTORY;

                mNeedNewMissedCallsNum = true;

            } else if (mCurrentPath.equals(CCH_PATH)|| mCurrentPath.equals(SIM_CCH_PATH)) {

            } else if (mCurrentPath.equals(CCH_PATH)) {

                appParamValue.needTag = ContentType.COMBINED_CALL_HISTORY;

            } else if (mCurrentPath.equals(TELECOM_PATH)|| mCurrentPath.equals(SIM_PATH)) {

            } else if (mCurrentPath.equals(TELECOM_PATH)) {

                /* PBAP 1.1.1 change */

                if (!validName && type.equals(TYPE_LISTING)) {

                    Log.e(TAG, "invalid vcard listing request in default folder");

                    return ResponseCodes.OBEX_HTTP_NOT_FOUND;

                }

            } else if (mCurrentPath.equals(SIM_PB_PATH)) {

                appParamValue.needTag = ContentType.SIM_PHONEBOOK;

            } else {

                Log.w(TAG, "mCurrentpath is not valid path!!!");

                return ResponseCodes.OBEX_HTTP_NOT_ACCEPTABLE;
@@ -495,6 +503,9 @@ public class BluetoothPbapObexServer extends ServerRequestHandler { 
                TYPE_PB, TYPE_LISTING, mCurrentPath)) {

                appParamValue.needTag = ContentType.SIM_PHONEBOOK;

                if (D) Log.d(TAG, "download SIM phonebook request");

                // Not support SIM card currently

                Log.w(TAG, "Not support access SIM card info!");

                return ResponseCodes.OBEX_HTTP_NOT_ACCEPTABLE;

            } else if (isNameMatchTarget(name, PB)) {

                appParamValue.needTag = ContentType.PHONEBOOK;

                if (D) {

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 


    private static final int SDP_PBAP_SERVER_VERSION = 0x0102;

    // PBAP v1.2.3, Sec. 7.1.2: local phonebook and favorites

    private static final int SDP_PBAP_SUPPORTED_REPOSITORIES = 0x000B;

    private static final int SDP_PBAP_SUPPORTED_REPOSITORIES = 0x0009;

    private static final int SDP_PBAP_SUPPORTED_FEATURES = 0x021F;



    /* PBAP will use Bluetooth notification ID from 1000000 (included) to 2000000 (excluded).