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

Commit 0b1acca4 authored by Henri Chataing's avatar Henri Chataing Committed by Android (Google) Code Review
Browse files

Merge "Deprecate BluetoothManagerServiceDumpProto in incident reports" into main

parents 4d8e9053 356aee72

core/proto/android/os/incident.proto

+2 −5
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import "frameworks/base/core/proto/android/os/system_properties.proto"; 
import "frameworks/base/core/proto/android/providers/settings.proto";

import "frameworks/base/core/proto/android/providers/settings.proto";

import "frameworks/base/core/proto/android/server/activitymanagerservice.proto";

import "frameworks/base/core/proto/android/server/activitymanagerservice.proto";

import "frameworks/base/core/proto/android/server/alarm/alarmmanagerservice.proto";

import "frameworks/base/core/proto/android/server/alarm/alarmmanagerservice.proto";

import "frameworks/base/core/proto/android/server/bluetooth_manager_service.proto";

import "frameworks/base/core/proto/android/server/fingerprint.proto";

import "frameworks/base/core/proto/android/server/fingerprint.proto";

import "frameworks/base/core/proto/android/server/jobscheduler.proto";

import "frameworks/base/core/proto/android/server/jobscheduler.proto";

import "frameworks/base/core/proto/android/server/location/context_hub.proto";

import "frameworks/base/core/proto/android/server/location/context_hub.proto";
@@ -483,10 +482,8 @@ message IncidentProto { 
        (section).args = "connmetrics --proto"

        (section).args = "connmetrics --proto"

    ];

    ];





    optional com.android.server.BluetoothManagerServiceDumpProto bluetooth_manager = 3050 [

    // Deprecated BluetoothManagerServiceDumpProto

        (section).type = SECTION_DUMPSYS,

    reserved 3050;

        (section).args = "bluetooth_manager --proto"

    ];





    optional com.android.server.location.ContextHubServiceProto context_hub = 3051 [

    optional com.android.server.location.ContextHubServiceProto context_hub = 3051 [

        (section).type = SECTION_DUMPSYS,

        (section).type = SECTION_DUMPSYS,

core/proto/android/server/Android.bp

deleted100644 → 0
+0 −28
Original line number Original line Diff line number Diff line 
//

// Copyright (C) 2021 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

  name: "srcs_bluetooth_manager_service_proto",

  srcs: [

      "bluetooth_manager_service.proto",

  ],

  visibility: ["//packages/modules/Bluetooth:__subpackages__"],

}

core/proto/android/server/bluetooth_manager_service.proto

deleted100644 → 0
+0 −49
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";

package com.android.server;



import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/bluetooth/enums.proto";



option java_multiple_files = true;



message BluetoothManagerServiceDumpProto {

   option (.android.msg_privacy).dest = DEST_AUTOMATIC;



   message ActiveLog {

      option (.android.msg_privacy).dest = DEST_AUTOMATIC;

      optional int64 timestamp_ms = 1;

      optional bool enable = 2;

      optional string package_name = 3;

      optional .android.bluetooth.EnableDisableReasonEnum reason = 4;

   }



   optional bool enabled = 1;

   optional int32 state = 2;

   optional string state_name = 3;

   optional string address = 4 [(.android.privacy).dest = DEST_EXPLICIT];

   optional string name = 5 [(.android.privacy).dest = DEST_EXPLICIT];

   optional int64 last_enabled_time_ms = 6;

   optional int64 curr_timestamp_ms = 7;

   repeated ActiveLog active_logs = 8;

   optional int32 num_crashes = 9;

   optional bool crash_log_maxed = 10;

   repeated int64 crash_timestamps_ms = 11;

   optional int32 num_ble_apps = 12;

   repeated string ble_app_package_names = 13;

}
 
 No newline at end of file