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

Commit b4e54538 authored by Kweku Adams's avatar Kweku Adams
Browse files

Refactoring GlobalSettingsProto to avoid method limit.

This is a large CL, so I'll do the other two protos in separate CLs.

Bug: 76011704
Bug: 74975371
Test: flash device and check incident.proto output
Change-Id: I285e6495b122c36eded9f6fc3afa39c92c293ed5
also: m EMMA_INSTRUMENT_STATIC=true EMMA_INSTRUMENT=true out/target/common/obj/APPS/CtsStatsdApp_intermediates/jacoco/work/instrumented/updated.stamp
also: atest CtsIncidentHostTestCases:com.android.server.cts.SettingsIncidentTest
parent 69d41b05
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Conventions for the protos in this directory:
1. If the proto describes the top level output of dumpsys, it should contain
   `Dump`. This makes it easy to understand that the proto is the dumpsys output
   of a certain service, not the data structure of that service, e.g.
   `WindowManagerServiceDumpProto` vs `WindowManagerServiceDumpProto`.
   `WindowManagerServiceDumpProto` vs `WindowManagerServiceProto`.

   * Inner messages whose containing messages have the `Proto` suffix do not
     need to have a `Proto` suffix. E.g:
+2 −495

File changed.

Preview size limit exceeded, changes collapsed.

+51 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 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 android.providers.settings;

option java_multiple_files = true;

message SettingProto {
    // ID of the setting
    optional string id = 1;

    // Name of the setting
    optional string name = 2;

    // Package name of the setting
    optional string pkg = 3;

    // Value of this setting
    optional string value = 4;

    // Default value of this setting
    optional string default_value = 5;

    // Whether the default is set by the system
    optional bool default_from_system = 6;
}

message SettingsOperationProto {
    // When the operation happened
    optional int64 timestamp = 1;

    // Type of the operation
    optional string operation = 2;

    // Name of the setting that was affected (optional)
    optional string setting = 3;
}
+942 −0

File added.

Preview size limit exceeded, changes collapsed.

+1005 −791

File changed.

Preview size limit exceeded, changes collapsed.