diff --git a/core/java/android/app/time/OWNERS b/core/java/android/app/time/OWNERS index 8f8089717e3b3..ef357e5a3b6a9 100644 --- a/core/java/android/app/time/OWNERS +++ b/core/java/android/app/time/OWNERS @@ -1,3 +1,4 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# The app-facing APIs related to both time and time zone detection. +include /services/core/java/com/android/server/timedetector/OWNERS +include /services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/core/java/android/app/timedetector/OWNERS b/core/java/android/app/timedetector/OWNERS index 941eed8de6317..e9dbe4a0007d5 100644 --- a/core/java/android/app/timedetector/OWNERS +++ b/core/java/android/app/timedetector/OWNERS @@ -1,4 +1,3 @@ # Bug component: 847766 -mingaleev@google.com -narayan@google.com -nfuller@google.com +# Internal APIs related to time detection. SDK APIs are in android.app.time. +include /services/core/java/com/android/server/timedetector/OWNERS diff --git a/core/java/android/app/timezone/OWNERS b/core/java/android/app/timezone/OWNERS index 8f8089717e3b3..04d78f23517fb 100644 --- a/core/java/android/app/timezone/OWNERS +++ b/core/java/android/app/timezone/OWNERS @@ -1,3 +1,4 @@ -# Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Bug component: 24949 +# Internal APIs related to APK-based time zone rule updates. +# Deprecated, deletion tracked by b/148144561 +include /services/core/java/com/android/server/timezone/OWNERS diff --git a/core/java/android/app/timezonedetector/OWNERS b/core/java/android/app/timezonedetector/OWNERS index 8f8089717e3b3..fa03f1e835fd8 100644 --- a/core/java/android/app/timezonedetector/OWNERS +++ b/core/java/android/app/timezonedetector/OWNERS @@ -1,3 +1,3 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Internal APIs related to time zone detection. SDK APIs are in android.app.time. +include /services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/core/java/android/service/timezone/OWNERS b/core/java/android/service/timezone/OWNERS index 28aff188dbd83..b5144d17a14c8 100644 --- a/core/java/android/service/timezone/OWNERS +++ b/core/java/android/service/timezone/OWNERS @@ -1,3 +1,3 @@ # Bug component: 847766 -nfuller@google.com -include /core/java/android/app/timedetector/OWNERS +# System APIs for system server time zone detection plugins. +include /services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/core/java/android/timezone/OWNERS b/core/java/android/timezone/OWNERS index 8f8089717e3b3..8b5e15635a738 100644 --- a/core/java/android/timezone/OWNERS +++ b/core/java/android/timezone/OWNERS @@ -1,3 +1,5 @@ -# Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Bug component: 24949 +# APIs originally intended to provide a stable API surface to access time zone rules data for use by +# unbundled components like a telephony mainline module and the ART module. Not exposed, potentially +# deletable if callers do not unbundle. +include platform/libcore:/OWNERS diff --git a/core/tests/coretests/src/android/app/time/OWNERS b/core/tests/coretests/src/android/app/time/OWNERS index 8f8089717e3b3..292cb72f2dbeb 100644 --- a/core/tests/coretests/src/android/app/time/OWNERS +++ b/core/tests/coretests/src/android/app/time/OWNERS @@ -1,3 +1,2 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +include /core/java/android/app/time/OWNERS diff --git a/core/tests/coretests/src/android/app/timedetector/OWNERS b/core/tests/coretests/src/android/app/timedetector/OWNERS index 8f8089717e3b3..c6124734bc5ce 100644 --- a/core/tests/coretests/src/android/app/timedetector/OWNERS +++ b/core/tests/coretests/src/android/app/timedetector/OWNERS @@ -1,3 +1,2 @@ # Bug component: 847766 -mingaleev@google.com include /core/java/android/app/timedetector/OWNERS diff --git a/core/tests/coretests/src/android/app/timezone/OWNERS b/core/tests/coretests/src/android/app/timezone/OWNERS index 8f8089717e3b3..381ecf1abda52 100644 --- a/core/tests/coretests/src/android/app/timezone/OWNERS +++ b/core/tests/coretests/src/android/app/timezone/OWNERS @@ -1,3 +1,2 @@ -# Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Bug component: 24949 +include /core/java/android/app/timezone/OWNERS diff --git a/core/tests/coretests/src/android/app/timezonedetector/OWNERS b/core/tests/coretests/src/android/app/timezonedetector/OWNERS index 8f8089717e3b3..2e9c3246e4fc7 100644 --- a/core/tests/coretests/src/android/app/timezonedetector/OWNERS +++ b/core/tests/coretests/src/android/app/timezonedetector/OWNERS @@ -1,3 +1,2 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +include /core/java/android/app/timezonedetector/OWNERS diff --git a/core/tests/coretests/src/android/service/timezone/OWNERS b/core/tests/coretests/src/android/service/timezone/OWNERS new file mode 100644 index 0000000000000..811638805996d --- /dev/null +++ b/core/tests/coretests/src/android/service/timezone/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 847766 +include /core/java/android/service/timezone/OWNERS diff --git a/services/core/java/com/android/server/timedetector/OWNERS b/services/core/java/com/android/server/timedetector/OWNERS index 8f8089717e3b3..67fc9d66d69d3 100644 --- a/services/core/java/com/android/server/timedetector/OWNERS +++ b/services/core/java/com/android/server/timedetector/OWNERS @@ -1,3 +1,3 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# This code is maintained by the same OWNERS as timezonedetector. +include /services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/services/core/java/com/android/server/timezone/OWNERS b/services/core/java/com/android/server/timezone/OWNERS index 8f8089717e3b3..2d365747473ab 100644 --- a/services/core/java/com/android/server/timezone/OWNERS +++ b/services/core/java/com/android/server/timezone/OWNERS @@ -1,3 +1,2 @@ -# Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Bug component: 24949 +include platform/libcore:/OWNERS diff --git a/services/core/java/com/android/server/timezonedetector/OWNERS b/services/core/java/com/android/server/timezonedetector/OWNERS index 8f8089717e3b3..029324246c919 100644 --- a/services/core/java/com/android/server/timezonedetector/OWNERS +++ b/services/core/java/com/android/server/timezonedetector/OWNERS @@ -1,3 +1,7 @@ # Bug component: 847766 +# This is the main list for platform time / time zone detection maintainers, for this dir and +# ultimately referenced by other OWNERS files for components maintained by the same team. +nfuller@google.com +jmorace@google.com mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +narayan@google.com diff --git a/services/tests/servicestests/src/com/android/server/timedetector/OWNERS b/services/tests/servicestests/src/com/android/server/timedetector/OWNERS index 8f8089717e3b3..a0f46e172da60 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/OWNERS +++ b/services/tests/servicestests/src/com/android/server/timedetector/OWNERS @@ -1,3 +1,2 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +include /services/core/java/com/android/server/timedetector/OWNERS diff --git a/services/tests/servicestests/src/com/android/server/timezone/OWNERS b/services/tests/servicestests/src/com/android/server/timezone/OWNERS index 8f8089717e3b3..61652604ee9f1 100644 --- a/services/tests/servicestests/src/com/android/server/timezone/OWNERS +++ b/services/tests/servicestests/src/com/android/server/timezone/OWNERS @@ -1,3 +1,2 @@ -# Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +# Bug component: 24949 +include /services/core/java/com/android/server/timezone/OWNERS diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS b/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS index 8f8089717e3b3..a6ff1ba8a8cb1 100644 --- a/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS +++ b/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS @@ -1,3 +1,2 @@ # Bug component: 847766 -mingaleev@google.com -include /core/java/android/app/timedetector/OWNERS +include /services/core/java/com/android/server/timezonedetector/OWNERS