summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/java/android/os/OWNERS6
-rw-r--r--core/java/com/android/internal/os/OWNERS3
-rw-r--r--core/tests/coretests/src/android/hardware/display/OWNERS3
-rw-r--r--core/tests/coretests/src/android/os/OWNERS4
-rw-r--r--media/jni/Android.bp3
-rw-r--r--media/jni/audioeffect/Android.bp3
-rw-r--r--media/lib/remotedisplay/OWNERS2
-rw-r--r--packages/SystemUI/Android.bp2
-rw-r--r--services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java6
-rw-r--r--services/core/jni/OWNERS4
10 files changed, 24 insertions, 12 deletions
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 04d49708b6ef..6d6757d5afd1 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -3,9 +3,9 @@ per-file *Vibration* = file:/services/core/java/com/android/server/vibrator/OWNE
per-file *Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS
# PowerManager
-per-file IPowerManager.aidl = michaelwr@google.com, santoscordon@google.com
-per-file PowerManager.java = michaelwr@google.com, santoscordon@google.com
-per-file PowerManagerInternal.java = michaelwr@google.com, santoscordon@google.com
+per-file IPowerManager.aidl = file:/services/core/java/com/android/server/power/OWNERS
+per-file PowerManager.java = file:/services/core/java/com/android/server/power/OWNERS
+per-file PowerManagerInternal.java = file:/services/core/java/com/android/server/power/OWNERS
# BatteryStats
per-file *BatteryConsumer* = file:/BATTERY_STATS_OWNERS
diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index 996e4244c473..391d25757af4 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -12,3 +12,6 @@ per-file *MultiState* = file:/BATTERY_STATS_OWNERS
per-file *PowerProfile* = file:/BATTERY_STATS_OWNERS
per-file *PowerStats* = file:/BATTERY_STATS_OWNERS
+# ANRs
+# Bug component : 158088 = per-file TimeoutRecord.java
+per-file TimeoutRecord.java = file:/PERFORMANCE_OWNERS
diff --git a/core/tests/coretests/src/android/hardware/display/OWNERS b/core/tests/coretests/src/android/hardware/display/OWNERS
index 9ca391013aa3..3bcb31defe7f 100644
--- a/core/tests/coretests/src/android/hardware/display/OWNERS
+++ b/core/tests/coretests/src/android/hardware/display/OWNERS
@@ -1,2 +1 @@
-michaelwr@google.com
-santoscordon@google.com
+file:/services/core/java/com/android/server/display/OWNERS
diff --git a/core/tests/coretests/src/android/os/OWNERS b/core/tests/coretests/src/android/os/OWNERS
index 8b333f3c3eaa..1c0073417c9a 100644
--- a/core/tests/coretests/src/android/os/OWNERS
+++ b/core/tests/coretests/src/android/os/OWNERS
@@ -1,11 +1,11 @@
# Display
-per-file BrightnessLimit.java = michaelwr@google.com, santoscordon@google.com
+per-file BrightnessLimit.java = file:/services/core/java/com/android/server/display/OWNERS
# Haptics
per-file *Vibrat*.java = file:/services/core/java/com/android/server/vibrator/OWNERS
# Power
-per-file PowerManager*.java = michaelwr@google.com, santoscordon@google.com
+per-file PowerManager*.java = file:/services/core/java/com/android/server/power/OWNERS
# PerformanceHintManager
per-file PerformanceHintManagerTest.java = file:/ADPF_OWNERS
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index e4405012cfee..21415166d4ed 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -125,6 +125,9 @@ cc_library_shared {
"-Wunused",
"-Wunreachable-code",
],
+
+ // TODO(b/330503129) Workaround build breakage.
+ lto_O0: true,
}
cc_library_shared {
diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp
index cf5059ceb3c9..7caa9e4863f9 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,4 +44,7 @@ cc_library_shared {
"-Wunreachable-code",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
+
+ // TODO(b/330503129) Workaround LTO build breakage.
+ lto_O0: true,
}
diff --git a/media/lib/remotedisplay/OWNERS b/media/lib/remotedisplay/OWNERS
index 7e7335d68d3b..6f6b6249f51a 100644
--- a/media/lib/remotedisplay/OWNERS
+++ b/media/lib/remotedisplay/OWNERS
@@ -1 +1 @@
-michaelwr@google.com
+file:/services/core/java/com/android/server/display/OWNERS \ No newline at end of file
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index d50b596228b7..b48cac58d7ba 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -420,6 +420,7 @@ android_app {
kotlincflags: ["-Xjvm-default=all"],
optimize: {
shrink_resources: false,
+ optimized_shrink_resources: false,
proguard_flags_files: ["proguard.flags"],
},
@@ -477,6 +478,7 @@ systemui_optimized_java_defaults {
optimize: true,
shrink: true,
shrink_resources: true,
+ optimized_shrink_resources: true,
ignore_warnings: false,
proguard_compatibility: false,
},
diff --git a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java
index f69104db7c10..3b9340b2402b 100644
--- a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java
@@ -274,8 +274,10 @@ class UiAutomationManager {
mMainHandler.post(() -> {
try {
final IAccessibilityServiceClient serviceInterface;
+ final UiAutomationService uiAutomationService;
synchronized (mLock) {
serviceInterface = mServiceInterface;
+ uiAutomationService = mUiAutomationService;
if (serviceInterface == null) {
mService = null;
} else {
@@ -286,8 +288,8 @@ class UiAutomationManager {
// If the serviceInterface is null, the UiAutomation has been shut down on
// another thread.
if (serviceInterface != null) {
- if (Flags.addWindowTokenWithoutLock()) {
- mUiAutomationService.addWindowTokensForAllDisplays();
+ if (Flags.addWindowTokenWithoutLock() && uiAutomationService != null) {
+ uiAutomationService.addWindowTokensForAllDisplays();
}
if (mTrace.isA11yTracingEnabledForTypes(
AccessibilityTrace.FLAGS_ACCESSIBILITY_SERVICE_CLIENT)) {
diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS
index 8de43c477567..2ef03ba742ba 100644
--- a/services/core/jni/OWNERS
+++ b/services/core/jni/OWNERS
@@ -5,8 +5,8 @@ per-file com_android_server_lights_LightsService.cpp = michaelwr@google.com, san
per-file com_android_server_input_* = file:/INPUT_OWNERS
# Power
-per-file com_android_server_HardwarePropertiesManagerService.cpp = michaelwr@google.com, santoscordon@google.com
-per-file com_android_server_power_PowerManagerService.* = michaelwr@google.com, santoscordon@google.com
+per-file com_android_server_HardwarePropertiesManagerService.cpp = file:/services/core/java/com/android/server/power/OWNERS
+per-file com_android_server_power_PowerManagerService.* = file:/services/core/java/com/android/server/power/OWNERS
# BatteryStats
per-file com_android_server_am_BatteryStatsService.cpp = file:/BATTERY_STATS_OWNERS
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-11 12:46:50 +0000