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

Commit 50981315 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5472349 from 0727797765fecf8a1b22172a720be311bfdcfa65 to qt-release 

Change-Id: I5aad6560fea708f3f1a638a6fbc9b0f4455a90ca
parents 5ff5fa2d 5b473fa5

framework/java/android/bluetooth/le/ScanRecord.java

+2 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth.le;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.bluetooth.BluetoothUuid;
@@ -97,7 +98,7 @@ public final class ScanRecord { 
     * Returns a list of service solicitation UUIDs within the advertisement that are used to

     * identify the Bluetooth GATT services.

     */

    @Nullable

    @NonNull

    public List<ParcelUuid> getServiceSolicitationUuids() {

        return mServiceSolicitationUuids;

    }
@@ -297,9 +298,6 @@ public final class ScanRecord { 
            if (serviceUuids.isEmpty()) {

                serviceUuids = null;

            }

            if (serviceSolicitationUuids.isEmpty()) {

                serviceSolicitationUuids = null;

            }

            return new ScanRecord(serviceUuids, serviceSolicitationUuids, manufacturerData,

                    serviceData, advertiseFlag, txPowerLevel, localName, scanRecord);

        } catch (Exception e) {

service/java/com/android/server/bluetooth/BluetoothService.java

+3 −4
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ package com.android.server; 


import android.bluetooth.BluetoothAdapter;

import android.content.Context;

import android.os.SystemProperties;



class BluetoothService extends SystemService {

    private static final String HEADLESS_SYSTEM_USER = "android.car.systemuser.headless";

import com.android.internal.os.RoSystemProperties;



class BluetoothService extends SystemService {

    private BluetoothManagerService mBluetoothManagerService;

    private boolean mInitialized = false;
@@ -48,7 +47,7 @@ class BluetoothService extends SystemService { 
            publishBinderService(BluetoothAdapter.BLUETOOTH_MANAGER_SERVICE,

                    mBluetoothManagerService);

        } else if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY &&

                !SystemProperties.getBoolean(HEADLESS_SYSTEM_USER, false)) {

                !RoSystemProperties.MULTIUSER_HEADLESS_SYSTEM_USER) {

            initialize();

        }

    }