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

Commit 1a042c99 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "OWNERS change / new .proto file" am: 6d3fb3d5 am: 6ca6f593 am: d34bf710 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8635a998a94b03dac597b7ab45de99a62488a680
parents 407fd06a d34bf710

core/proto/android/app/OWNERS

+1 −1
Original line number Diff line number Diff line 
per-file location_time_zone_manager.proto = nfuller@google.com, mingaleev@google.com
 
per-file location_time_zone_manager.proto, time_zone_detector.proto = nfuller@google.com, mingaleev@google.com

core/proto/android/app/location_time_zone_manager.proto

+1 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
syntax = "proto2";

package android.app.time;



import "frameworks/base/core/proto/android/app/time_zone_detector.proto";

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



option java_multiple_files = true;
@@ -31,15 +32,6 @@ message LocationTimeZoneManagerServiceStateProto { 
  repeated TimeZoneProviderStateProto secondary_provider_states = 3;

}



// Represents a GeolocationTimeZoneSuggestion that can be / has been passed to the time zone

// detector.

message GeolocationTimeZoneSuggestionProto {

  option (android.msg_privacy).dest = DEST_AUTOMATIC;



  repeated string zone_ids = 1;

  repeated string debug_info = 2;

}



// The state tracked for a LocationTimeZoneProvider.

message TimeZoneProviderStateProto {

  option (android.msg_privacy).dest = DEST_AUTOMATIC;

core/proto/android/app/time_zone_detector.proto

0 → 100644
+32 −0
Original line number 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.

 */



syntax = "proto2";

package android.app.time;



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



option java_multiple_files = true;

option java_outer_classname = "TimeZoneDetectorProto";



// Represents a GeolocationTimeZoneSuggestion that can be / has been passed to the time zone

// detector.

message GeolocationTimeZoneSuggestionProto {

  option (android.msg_privacy).dest = DEST_AUTOMATIC;



  repeated string zone_ids = 1;

  repeated string debug_info = 2;

}