Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "OWNERS change / new .proto file" am: 6d3fb3d57c am: 6ca6f593a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35dae3f53d34a1fb0628503857659bf394e07779
This commit is contained in:
Neil Fuller
2021-03-11 18:12:01 +00:00
committed by Automerger Merge Worker
parent c8cf0becf0 6ca6f593a1
commit d34bf7100d
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/proto/android/app/OWNERS
View File

@@ -1 +1 @@
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

10
core/proto/android/app/location_time_zone_manager.proto
View File

@@ -17,6 +17,7 @@
syntax = "proto2"; syntax = "proto2";
package android.app.time; package android.app.time;
import "frameworks/base/core/proto/android/app/time_zone_detector.proto";
import "frameworks/base/core/proto/android/privacy.proto"; import "frameworks/base/core/proto/android/privacy.proto";
option java_multiple_files = true; option java_multiple_files = true;
@@ -31,15 +32,6 @@ message LocationTimeZoneManagerServiceStateProto {
repeated TimeZoneProviderStateProto secondary_provider_states = 3; 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. // The state tracked for a LocationTimeZoneProvider.
message TimeZoneProviderStateProto { message TimeZoneProviderStateProto {
option (android.msg_privacy).dest = DEST_AUTOMATIC; option (android.msg_privacy).dest = DEST_AUTOMATIC;

32
core/proto/android/app/time_zone_detector.proto Normal file
View File

@@ -0,0 +1,32 @@
/*
* 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;
}