diff options
| -rw-r--r-- | api/OWNERS | 4 | ||||
| -rw-r--r-- | core/jni/OWNERS | 2 | ||||
| -rw-r--r-- | core/res/res/values/locale_config.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/media/OWNERS | 2 | ||||
| -rw-r--r-- | proto/src/system_messages.proto | 4 | ||||
| -rw-r--r-- | services/OWNERS | 2 | ||||
| -rw-r--r-- | services/api/OWNERS | 2 | ||||
| -rw-r--r-- | services/core/jni/OWNERS | 2 |
8 files changed, 14 insertions, 7 deletions
diff --git a/api/OWNERS b/api/OWNERS index 4d8ed0347f43..bf6216c168e8 100644 --- a/api/OWNERS +++ b/api/OWNERS @@ -3,7 +3,7 @@ hansson@google.com # Modularization team file:platform/packages/modules/common:/OWNERS -per-file Android.bp = file:platform/build/soong:/OWNERS +per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION} # For metalava team to disable lint checks in platform -per-file Android.bp = aurimas@google.com,emberrose@google.com,sjgilbert@google.com
\ No newline at end of file +per-file Android.bp = aurimas@google.com,emberrose@google.com,sjgilbert@google.com diff --git a/core/jni/OWNERS b/core/jni/OWNERS index 671e63493323..7f50204fb842 100644 --- a/core/jni/OWNERS +++ b/core/jni/OWNERS @@ -49,7 +49,7 @@ per-file android_hardware_SensorManager* = arthuri@google.com, bduddie@google.co per-file *Zygote* = file:/ZYGOTE_OWNERS per-file core_jni_helpers.* = file:/ZYGOTE_OWNERS per-file fd_utils.* = file:/ZYGOTE_OWNERS -per-file Android.bp = file:platform/build/soong:/OWNERS +per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION} per-file android_animation_* = file:/core/java/android/animation/OWNERS per-file android_app_admin_* = file:/core/java/android/app/admin/OWNERS per-file android_hardware_Usb* = file:/services/usb/OWNERS diff --git a/core/res/res/values/locale_config.xml b/core/res/res/values/locale_config.xml index e9b42d392a2c..78ec14579bf1 100644 --- a/core/res/res/values/locale_config.xml +++ b/core/res/res/values/locale_config.xml @@ -23,7 +23,7 @@ <item>ak-GH</item> <!-- Akan (Ghana) --> <item>am-ET</item> <!-- Amharic (Ethiopia) --> <item>ar-AE</item> <!-- Arabic (United Arab Emirates) --> - <item>ar-AE-u-nu-latn</item> <!-- Arabic (United Arab Emirates, Western Digits) --> + <item>ar-AE-u-nu-arab</item> <!-- Arabic (United Arab Emirates, Arabic Digits) --> <item>ar-BH</item> <!-- Arabic (Bahrain) --> <item>ar-BH-u-nu-latn</item> <!-- Arabic (Bahrain, Western Digits) --> <item>ar-DJ</item> <!-- Arabic (Djibouti) --> @@ -190,6 +190,7 @@ <item>en-MS</item> <!-- English (Montserrat) --> <item>en-MT</item> <!-- English (Malta) --> <item>en-MU</item> <!-- English (Mauritius) --> + <item>en-MV</item> <!-- English (Maldives) --> <item>en-MW</item> <!-- English (Malawi) --> <item>en-MY</item> <!-- English (Malaysia) --> <item>en-NA</item> <!-- English (Namibia) --> diff --git a/packages/SettingsLib/src/com/android/settingslib/media/OWNERS b/packages/SettingsLib/src/com/android/settingslib/media/OWNERS new file mode 100644 index 000000000000..d40f322042fe --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/media/OWNERS @@ -0,0 +1,2 @@ +# Default reviewers for this and subdirectories. +shaoweishen@google.com diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index dfa34bb50805..b87773bbe0b2 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -290,6 +290,10 @@ message SystemMessage { // Package: android NOTE_REVIEW_NOTIFICATION_PERMISSIONS = 71; + // Inform the user of bluetooth apm state changes. + // Package: android + NOTE_BT_APM_NOTIFICATION = 74; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release diff --git a/services/OWNERS b/services/OWNERS index 67cee5517913..495c0737e599 100644 --- a/services/OWNERS +++ b/services/OWNERS @@ -1,4 +1,4 @@ -per-file Android.bp = file:platform/build/soong:/OWNERS +per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION} # art-team@ manages the system server profile per-file art-profile* = calin@google.com, ngeoffray@google.com, vmarko@google.com diff --git a/services/api/OWNERS b/services/api/OWNERS index a6093900c635..e10440c1aed5 100644 --- a/services/api/OWNERS +++ b/services/api/OWNERS @@ -1,4 +1,4 @@ -per-file Android.bp = file:platform/build/soong:/OWNERS +per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION} # API changes are managed via Prolog rules, not OWNERS * diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS index 85671105ec25..9abf107c780a 100644 --- a/services/core/jni/OWNERS +++ b/services/core/jni/OWNERS @@ -11,7 +11,7 @@ per-file com_android_server_power_PowerManagerService.* = michaelwr@google.com, # BatteryStats per-file com_android_server_am_BatteryStatsService.cpp = file:/BATTERY_STATS_OWNERS -per-file Android.bp = file:platform/build/soong:/OWNERS +per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION} per-file com_android_server_Usb* = file:/services/usb/OWNERS per-file com_android_server_Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS per-file com_android_server_hdmi_* = file:/core/java/android/hardware/hdmi/OWNERS |