diff options
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | SQLITE_OWNERS | 2 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/OWNERS | 1 | ||||
| -rw-r--r-- | core/jni/OWNERS | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/database/sqlite/OWNERS | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java | 7 |
7 files changed, 16 insertions, 3 deletions
@@ -38,3 +38,4 @@ per-file TestProtoLibraries.bp = file:platform/platform_testing:/libraries/healt per-file TestProtoLibraries.bp = file:platform/tools/tradefederation:/OWNERS per-file ZYGOTE_OWNERS = file:/ZYGOTE_OWNERS +per-file SQLITE_OWNERS = file:/SQLITE_OWNERS diff --git a/SQLITE_OWNERS b/SQLITE_OWNERS new file mode 100644 index 000000000000..1ff72e7689a7 --- /dev/null +++ b/SQLITE_OWNERS @@ -0,0 +1,2 @@ +shayba@google.com +shombert@google.com diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index e85fa9d46d10..1807fb66da8f 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5369,8 +5369,8 @@ public class Activity extends ContextThemeWrapper * result callbacks including {@link #onRequestPermissionsResult(int, String[], int[])}. * </p> * <p> - * The <a href="https://github.com/android/permissions-samples"> - * RuntimePermissions</a> sample apps demonstrate how to use this method to + * The <a href="https://github.com/android/platform-samples/tree/main/samples/privacy/permissions"> + * permissions samples</a> repo demonstrates how to use this method to * request permissions at run time. * </p> * diff --git a/core/java/android/database/sqlite/OWNERS b/core/java/android/database/sqlite/OWNERS new file mode 100644 index 000000000000..3bebc7c56f61 --- /dev/null +++ b/core/java/android/database/sqlite/OWNERS @@ -0,0 +1 @@ +include /SQLITE_OWNERS diff --git a/core/jni/OWNERS b/core/jni/OWNERS index 84b050cdfbdb..a17048c27763 100644 --- a/core/jni/OWNERS +++ b/core/jni/OWNERS @@ -102,3 +102,6 @@ per-file com_android_internal_os_*MultiStateCounter* = file:/BATTERY_STATS_OWNER # PM per-file com_android_internal_content_* = file:/PACKAGE_MANAGER_OWNERS + +# SQLite +per-file android_database_SQLite* = file:/SQLITE_OWNERS diff --git a/core/tests/coretests/src/android/database/sqlite/OWNERS b/core/tests/coretests/src/android/database/sqlite/OWNERS new file mode 100644 index 000000000000..3bebc7c56f61 --- /dev/null +++ b/core/tests/coretests/src/android/database/sqlite/OWNERS @@ -0,0 +1 @@ +include /SQLITE_OWNERS diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java index d10e890f3c02..534049b65cb4 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java @@ -75,7 +75,12 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList mLearnMore.setVisibility(View.VISIBLE); } - mEnableUsb.setOnClickListener(this); + if (!mUsbPort.supportsEnableContaminantPresenceDetection()) { + mEnableUsb.setVisibility(View.GONE); + } else { + mEnableUsb.setOnClickListener(this); + } + mGotIt.setOnClickListener(this); mLearnMore.setOnClickListener(this); } |