summaryrefslogtreecommitdiff
path: root/core/proto
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2021-03-11 14:28:59 +0000
committerNeil Fuller <nfuller@google.com>2021-03-11 14:28:59 +0000
commitc3c171cbe5e1747a3d28ee2b60f72c59cb12b414 (patch)
treebd86e7267f9424f6422ca6f1cf696f2241604b17 /core/proto
parenta517079da055a0de71b01bdd30e2e903eddc14cb (diff)
OWNERS change / new .proto file
Splitting out GeolocationTimeZoneSuggestionProto to time_zone_detector.proto. Test: build only Bug: 172934905 Change-Id: Ib7798955ae7ab3a486aa33d2bed85f4bbd8511e1
Diffstat (limited to 'core/proto')
-rw-r--r--core/proto/android/app/OWNERS2
-rw-r--r--core/proto/android/app/location_time_zone_manager.proto10
-rw-r--r--core/proto/android/app/time_zone_detector.proto32
3 files changed, 34 insertions, 10 deletions
diff --git a/core/proto/android/app/OWNERS b/core/proto/android/app/OWNERS
index 296abd18aadc..cc479e61b855 100644
--- a/core/proto/android/app/OWNERS
+++ b/core/proto/android/app/OWNERS
@@ -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
diff --git a/core/proto/android/app/location_time_zone_manager.proto b/core/proto/android/app/location_time_zone_manager.proto
index f44d5495f132..891e9fca36aa 100644
--- a/core/proto/android/app/location_time_zone_manager.proto
+++ b/core/proto/android/app/location_time_zone_manager.proto
@@ -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;
diff --git a/core/proto/android/app/time_zone_detector.proto b/core/proto/android/app/time_zone_detector.proto
new file mode 100644
index 000000000000..c7919b39956d
--- /dev/null
+++ b/core/proto/android/app/time_zone_detector.proto
@@ -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;
+}