From 7444e309f97ca9b24558a42b2caeedcf073d67ed Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 9 Dec 2020 11:05:51 -0700 Subject: [PATCH] Revert "Temporarily replace "android.com" accounts." This reverts commit 0ace970e1997c91b1b105eb3e326963bc04164d3. Bug: 174932174, 175111824 Exempt-From-Owner-Approval: refactoring with team leads buy-in Change-Id: I152186408ecf6da1cb7354d14737de7cce55a34b --- apex/jobscheduler/OWNERS | 2 +- core/java/android/database/OWNERS | 2 +- core/java/android/net/OWNERS | 2 +- core/java/com/android/internal/net/OWNERS | 2 +- media/OWNERS | 2 +- media/java/android/mtp/OWNERS | 2 +- media/jni/OWNERS | 2 +- media/tests/MtpTests/OWNERS | 2 +- packages/SettingsLib/OWNERS | 2 +- packages/Shell/OWNERS | 2 +- packages/SystemUI/OWNERS | 2 +- proto/src/metrics_constants/OWNERS | 2 +- services/core/java/com/android/server/dreams/OWNERS | 2 +- services/core/java/com/android/server/net/OWNERS | 2 +- services/core/java/com/android/server/notification/OWNERS | 2 +- services/core/java/com/android/server/pm/OWNERS | 8 ++++---- .../core/java/com/android/server/pm/permission/OWNERS | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/apex/jobscheduler/OWNERS b/apex/jobscheduler/OWNERS index 0fe6cdffa5f6b..d004eed2a0db4 100644 --- a/apex/jobscheduler/OWNERS +++ b/apex/jobscheduler/OWNERS @@ -1,6 +1,6 @@ yamasani@google.com omakoto@google.com -ctate@google.com +ctate@android.com ctate@google.com kwekua@google.com suprabh@google.com \ No newline at end of file diff --git a/core/java/android/database/OWNERS b/core/java/android/database/OWNERS index 1734cfcad3604..7e19942ba332e 100644 --- a/core/java/android/database/OWNERS +++ b/core/java/android/database/OWNERS @@ -1,3 +1,3 @@ omakoto@google.com -jsharkey@google.com +jsharkey@android.com yamasani@google.com diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index 2f8f685af40b2..5e2a71876103b 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -2,7 +2,7 @@ set noparent codewiz@google.com jchalard@google.com -jsharkey@google.com +jsharkey@android.com junyulai@google.com lorenzo@google.com reminv@google.com diff --git a/core/java/com/android/internal/net/OWNERS b/core/java/com/android/internal/net/OWNERS index fec56c3cc5061..050cb5c2b44ed 100644 --- a/core/java/com/android/internal/net/OWNERS +++ b/core/java/com/android/internal/net/OWNERS @@ -3,7 +3,7 @@ set noparent codewiz@google.com ek@google.com jchalard@google.com -jsharkey@google.com +jsharkey@android.com lorenzo@google.com reminv@google.com satk@google.com diff --git a/media/OWNERS b/media/OWNERS index b2875e7f067ca..e74149019b115 100644 --- a/media/OWNERS +++ b/media/OWNERS @@ -10,7 +10,7 @@ insun@google.com jaewan@google.com jinpark@google.com jmtrivi@google.com -jsharkey@google.com +jsharkey@android.com klhyun@google.com lajos@google.com marcone@google.com diff --git a/media/java/android/mtp/OWNERS b/media/java/android/mtp/OWNERS index e27d06f4825af..1928ba811e7e4 100644 --- a/media/java/android/mtp/OWNERS +++ b/media/java/android/mtp/OWNERS @@ -1,7 +1,7 @@ set noparent marcone@google.com -jsharkey@google.com +jsharkey@android.com jameswei@google.com rmojumder@google.com diff --git a/media/jni/OWNERS b/media/jni/OWNERS index e6e4f86505cfe..f1b0237d9008a 100644 --- a/media/jni/OWNERS +++ b/media/jni/OWNERS @@ -1,5 +1,5 @@ # extra for MTP related files -per-file android_mtp_*.cpp=marcone@google.com,jsharkey@google.com,jameswei@google.com,rmojumder@google.com +per-file android_mtp_*.cpp=marcone@google.com,jsharkey@android.com,jameswei@google.com,rmojumder@google.com # extra for TV related files per-file android_media_tv_*=nchalko@google.com,quxiangfang@google.com diff --git a/media/tests/MtpTests/OWNERS b/media/tests/MtpTests/OWNERS index e27d06f4825af..1928ba811e7e4 100644 --- a/media/tests/MtpTests/OWNERS +++ b/media/tests/MtpTests/OWNERS @@ -1,7 +1,7 @@ set noparent marcone@google.com -jsharkey@google.com +jsharkey@android.com jameswei@google.com rmojumder@google.com diff --git a/packages/SettingsLib/OWNERS b/packages/SettingsLib/OWNERS index 30c10d3ef3b8b..8eafbdfdf6bcb 100644 --- a/packages/SettingsLib/OWNERS +++ b/packages/SettingsLib/OWNERS @@ -1,5 +1,5 @@ # People who can approve changes for submission -dsandler@google.com +dsandler@android.com edgarwang@google.com emilychuang@google.com evanlaird@google.com diff --git a/packages/Shell/OWNERS b/packages/Shell/OWNERS index 2d7a3e68f86a7..6ba1fcb058b12 100644 --- a/packages/Shell/OWNERS +++ b/packages/Shell/OWNERS @@ -1,6 +1,6 @@ set noparent -jsharkey@google.com +jsharkey@android.com felipeal@google.com nandana@google.com svetoslavganov@google.com diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index 3bda7106defae..f884270eaba85 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -1,6 +1,6 @@ set noparent -dsandler@google.com +dsandler@android.com aaliomer@google.com adamcohen@google.com diff --git a/proto/src/metrics_constants/OWNERS b/proto/src/metrics_constants/OWNERS index ab4d808f5ff0e..7009282b66e10 100644 --- a/proto/src/metrics_constants/OWNERS +++ b/proto/src/metrics_constants/OWNERS @@ -1,4 +1,4 @@ -cwren@google.com +cwren@android.com yanglu@google.com yaochen@google.com yro@google.com diff --git a/services/core/java/com/android/server/dreams/OWNERS b/services/core/java/com/android/server/dreams/OWNERS index 3c9bbf8797ea7..426f002ad236c 100644 --- a/services/core/java/com/android/server/dreams/OWNERS +++ b/services/core/java/com/android/server/dreams/OWNERS @@ -1,3 +1,3 @@ -dsandler@google.com +dsandler@android.com michaelwr@google.com roosa@google.com diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS index d5c7618199fe6..28ae6a417bd3d 100644 --- a/services/core/java/com/android/server/net/OWNERS +++ b/services/core/java/com/android/server/net/OWNERS @@ -2,7 +2,7 @@ set noparent codewiz@google.com jchalard@google.com -jsharkey@google.com +jsharkey@android.com junyulai@google.com lorenzo@google.com reminv@google.com diff --git a/services/core/java/com/android/server/notification/OWNERS b/services/core/java/com/android/server/notification/OWNERS index 4dcb7995d8ae6..5a19656b36a61 100644 --- a/services/core/java/com/android/server/notification/OWNERS +++ b/services/core/java/com/android/server/notification/OWNERS @@ -1,4 +1,4 @@ -dsandler@google.com +dsandler@android.com juliacr@google.com beverlyt@google.com pixel@google.com diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS index 7a2b7a62b7ddf..004259b7478c8 100644 --- a/services/core/java/com/android/server/pm/OWNERS +++ b/services/core/java/com/android/server/pm/OWNERS @@ -1,12 +1,12 @@ +hackbod@android.com hackbod@google.com -hackbod@google.com -jsharkey@google.com +jsharkey@android.com jsharkey@google.com narayan@google.com patb@google.com +svetoslavganov@android.com svetoslavganov@google.com -svetoslavganov@google.com -toddke@google.com +toddke@android.com toddke@google.com # apex support diff --git a/services/core/java/com/android/server/pm/permission/OWNERS b/services/core/java/com/android/server/pm/permission/OWNERS index 6e678305b8602..0e88862e01b19 100644 --- a/services/core/java/com/android/server/pm/permission/OWNERS +++ b/services/core/java/com/android/server/pm/permission/OWNERS @@ -1,7 +1,7 @@ moltmann@google.com zhanghai@google.com -per-file DefaultPermissionGrantPolicy.java = hackbod@google.com -per-file DefaultPermissionGrantPolicy.java = jsharkey@google.com +per-file DefaultPermissionGrantPolicy.java = hackbod@android.com +per-file DefaultPermissionGrantPolicy.java = jsharkey@android.com per-file DefaultPermissionGrantPolicy.java = svetoslavganov@google.com per-file DefaultPermissionGrantPolicy.java = toddke@google.com per-file DefaultPermissionGrantPolicy.java = yamasani@google.com