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

Commit e5966df1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9401607 from f0a865db to tm-qpr2-release 

Change-Id: Ie9966e3a5a07b9296a8f4f383be1262635435991
parents efa8b2d4 f0a865db

android/app/src/com/android/bluetooth/mapclient/obex/ObexAppParameters.java→android/app/src/com/android/bluetooth/ObexAppParameters.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.bluetooth.mapclient;

package com.android.bluetooth;



import com.android.obex.HeaderSet;

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+8 −115
Original line number Diff line number Diff line
@@ -5163,123 +5163,16 @@ public class AdapterService extends Service { 
        }

    }



    // Boolean flags

    private static final String SDP_SKIP_RNR_IF_KNOWN = "INIT_sdp_skip_rnr_if_known";

    private static final String SDP_SERIALIZATION_FLAG = "INIT_sdp_serialization";

    private static final String GD_CORE_FLAG = "INIT_gd_core";

    private static final String GD_ADVERTISING_FLAG = "INIT_gd_advertising";

    private static final String GD_SCANNING_FLAG = "INIT_gd_scanning";

    private static final String GD_HCI_FLAG = "INIT_gd_hci";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_ACL_FLAG = "INIT_gd_acl";

    private static final String GD_L2CAP_FLAG = "INIT_gd_l2cap";

    private static final String GD_RUST_FLAG = "INIT_gd_rust";

    private static final String GD_LINK_POLICY_FLAG = "INIT_gd_link_policy";

    private static final String GATT_ROBUST_CACHING_CLIENT_FLAG = "INIT_gatt_robust_caching_client";

    private static final String GATT_ROBUST_CACHING_SERVER_FLAG = "INIT_gatt_robust_caching_server";

    private static final String IRK_ROTATION_FLAG = "INIT_irk_rotation";

    private static final String PASS_PHY_UPDATE_CALLBACK_FLAG = "INIT_pass_phy_update_callback";

    private static final String BTM_DM_FLUSH_DISCOVERY_QUEUE_ON_SEARCH_CANCEL =

                                    "INIT_btm_dm_flush_discovery_queue_on_search_cancel";



    /**

     * Logging flags logic (only applies to DEBUG and VERBOSE levels):

     * if LOG_TAG in LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG:

     *   DO NOT LOG

     * else if LOG_TAG in LOGGING_DEBUG_ENABLED_FOR_TAGS_FLAG:

     *   DO LOG

     * else if LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG:

     *   DO LOG

     * else:

     *   DO NOT LOG

     */

    private static final String LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG =

            "INIT_logging_debug_enabled_for_all";

    // String flags

    // Comma separated tags

    private static final String LOGGING_DEBUG_ENABLED_FOR_TAGS_FLAG =

            "INIT_logging_debug_enabled_for_tags";

    private static final String LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG =

            "INIT_logging_debug_disabled_for_tags";

    private static final String BTAA_HCI_LOG_FLAG = "INIT_btaa_hci";



    @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG)

    private String[] getInitFlags() {

        final DeviceConfig.Properties properties =

                DeviceConfig.getProperties(DeviceConfig.NAMESPACE_BLUETOOTH);

        ArrayList<String> initFlags = new ArrayList<>();

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CORE_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_CORE_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                    SDP_SKIP_RNR_IF_KNOWN, true)) {

            initFlags.add(String.format("%s=%s", SDP_SKIP_RNR_IF_KNOWN, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                    SDP_SERIALIZATION_FLAG, true)) {

            initFlags.add(String.format("%s=%s", SDP_SERIALIZATION_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_ADVERTISING_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_ADVERTISING_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_SCANNING_FLAG,

                Config.isGdEnabledUpToScanningLayer())) {

            initFlags.add(String.format("%s=%s", GD_SCANNING_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_HCI_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_HCI_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CONTROLLER_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_CONTROLLER_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_ACL_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_ACL_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_L2CAP_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_L2CAP_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_RUST_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_RUST_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_LINK_POLICY_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GD_LINK_POLICY_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                GATT_ROBUST_CACHING_CLIENT_FLAG, true)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_CLIENT_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                GATT_ROBUST_CACHING_SERVER_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_SERVER_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, IRK_ROTATION_FLAG, false)) {

            initFlags.add(String.format("%s=%s", IRK_ROTATION_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_BLUETOOTH, PASS_PHY_UPDATE_CALLBACK_FLAG, true)) {

            initFlags.add(String.format("%s=%s", PASS_PHY_UPDATE_CALLBACK_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_BLUETOOTH,

                BTM_DM_FLUSH_DISCOVERY_QUEUE_ON_SEARCH_CANCEL, false)) {

            initFlags.add(String.format("%s=%s",

                    BTM_DM_FLUSH_DISCOVERY_QUEUE_ON_SEARCH_CANCEL, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, "true"));

        }

        String debugLoggingEnabledTags = DeviceConfig.getString(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_TAGS_FLAG, "");

        if (!debugLoggingEnabledTags.isEmpty()) {

            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_ENABLED_FOR_TAGS_FLAG,

                    debugLoggingEnabledTags));

        }

        String debugLoggingDisabledTags = DeviceConfig.getString(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG, "");

        if (!debugLoggingDisabledTags.isEmpty()) {

            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG,

                    debugLoggingDisabledTags));

        for (String property: properties.getKeyset()) {

            if (property.startsWith("INIT_")) {

                initFlags.add(String.format("%s=%s", property,

                            properties.getString(property, null)));

            }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, BTAA_HCI_LOG_FLAG, true)) {

            initFlags.add(String.format("%s=%s", BTAA_HCI_LOG_FLAG, "true"));

        }

        return initFlags.toArray(new String[0]);

    }

android/app/src/com/android/bluetooth/mapclient/MasClient.java

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.Message; 
import android.util.Log;



import com.android.bluetooth.BluetoothObexTransport;

import com.android.bluetooth.ObexAppParameters;

import com.android.internal.util.StateMachine;

import com.android.obex.ClientSession;

import com.android.obex.HeaderSet;

android/app/src/com/android/bluetooth/mapclient/MnsObexServer.java

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.bluetooth.mapclient; 


import android.util.Log;



import com.android.bluetooth.ObexAppParameters;

import com.android.bluetooth.ObexServerSockets;

import com.android.obex.HeaderSet;

import com.android.obex.Operation;

android/app/src/com/android/bluetooth/mapclient/obex/RequestGetFolderListing.java

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.bluetooth.mapclient;



import com.android.bluetooth.ObexAppParameters;

import com.android.obex.ClientSession;

import com.android.obex.HeaderSet;