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

Commit 3e23e778 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Security logging for Bluetooth connection events" am: 65a46a7f 

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



Change-Id: I5897f0838154aab411b28939ff4fdb4664e99c16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2851262 65a46a7f

android/app/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.WRITE_SECURITY_LOG"/>

    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>

    <uses-permission android:name="android.permission.WRITE_SMS"/>

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

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 
import static android.Manifest.permission.BLUETOOTH_SCAN;



import android.annotation.RequiresPermission;

import android.app.admin.SecurityLog;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothAssignedNumbers;

import android.bluetooth.BluetoothClass;
@@ -950,6 +951,8 @@ final class RemoteDevices { 
            if (batteryService != null) {

                batteryService.connectIfPossible(device);

            }

            SecurityLog.writeEvent(SecurityLog.TAG_BLUETOOTH_CONNECTION,

                    Utils.getLoggableAddress(device), /* success */ 1, /* reason */ "");

            debugLog(

                    "aclStateChangeCallback: Adapter State: " + BluetoothAdapter.nameForState(state)

                            + " Connected: " + device);
@@ -985,6 +988,10 @@ final class RemoteDevices { 
                    deviceProp.setBondingInitiatedLocally(false);

                }

            }

            SecurityLog.writeEvent(SecurityLog.TAG_BLUETOOTH_DISCONNECTION,

                    Utils.getLoggableAddress(device),

                    BluetoothAdapter.BluetoothConnectionCallback.disconnectReasonToString(

                            AdapterService.hciToAndroidDisconnectReason(hciReason)));

            debugLog(

                    "aclStateChangeCallback: Adapter State: " + BluetoothAdapter.nameForState(state)

                            + " Disconnected: " + device

apex/permissions/com.android.bluetooth.xml

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ 
        <permission name="android.permission.UPDATE_DEVICE_STATS" />

        <permission name="android.permission.WRITE_APN_SETTINGS" />

        <permission name="android.permission.WRITE_SECURE_SETTINGS" />

        <permission name="android.permission.WRITE_SECURITY_LOG" />

    </privapp-permissions>

</permissions>

system/gd/common/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package { 
filegroup {

    name: "BluetoothCommonSources",

    srcs: [

        "audit_log.cc",

        "init_flags.cc",

        "metric_id_manager.cc",

        "strings.cc",

system/gd/common/BUILD.gn

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


source_set("BluetoothCommonSources") {

  sources = [

    "audit_log.cc",

    "init_flags.cc",

    "metric_id_manager.cc",

    "stop_watch.cc",