diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-06 00:18:37 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-06 00:18:37 +0000 |
| commit | 34521b66573e9a234424ea582bcf3c604fa95051 (patch) | |
| tree | a69b9dcb5577d00c2001b2c57f51ffbbec3ee57a | |
| parent | c1d8ef1a3f0526949320aeaa2b645f94dc6e2c9f (diff) | |
| parent | dee4388b9330b16e4edf7c7afda53dcb98e0489a (diff) | |
| download | Settings-34521b66573e9a234424ea582bcf3c604fa95051.tar.gz | |
Snap for 11533947 from dee4388b9330b16e4edf7c7afda53dcb98e0489a to sdk-release
Change-Id: Ic2380ec68d031f684dd9da21cfb2911fdda5d1ee
| -rw-r--r-- | src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt | 2 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/OWNERS | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt b/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt index 10e3f849905..f5c0a87fde2 100644 --- a/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt +++ b/src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt @@ -156,7 +156,7 @@ class ThreadNetworkPreferenceController @VisibleForTesting constructor( return true } - override fun onStateChanged(lifecycleOwner: LifecycleOwner, event: Lifecycle.Event) { + override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) { if (threadController == null) { return } diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS index 7c7d7928cfc..8dc48707865 100644 --- a/src/com/android/settings/inputmethod/OWNERS +++ b/src/com/android/settings/inputmethod/OWNERS @@ -3,6 +3,7 @@ include platform/frameworks/base:/services/core/java/com/android/server/inputmet include /OWNERS # Settings for physical keyboard and game pad are better to be reviewed by the input team -per-file GameControllerPreferenceController.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS -per-file KeyboardLayoutPicker*.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS -per-file PhysicalKeyboard*.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS +per-file GameControllerPreferenceController.java = file:platform/frameworks/base:/INPUT_OWNERS +per-file KeyboardLayoutPicker*.java = file:platform/frameworks/base:/INPUT_OWNERS +per-file PhysicalKeyboard*.java = file:platform/frameworks/base:/INPUT_OWNERS +per-file Trackpad*.java = file:platform/frameworks/base:/INPUT_OWNERS |