From ada0d396e40f665eb24b4973c2881f231027ab2d Mon Sep 17 00:00:00 2001 From: Winson Date: Thu, 3 Jun 2021 12:48:49 -0700 Subject: [PATCH] Add missing Resources OWNERS to FrameworksCoreTests Alos moves the OverlayConfig stuff into a subpackage, so the new OWNERS file can live there instead of the parent com.android.internal.content. Bug: 189988918 Test: none, OWNERS Change-Id: Iba0b1866683f96beea2df4e97ca436700fe46457 --- core/tests/coretests/apks/overlay_config/OWNERS | 1 + .../coretests/src/com/android/internal/content/res/OWNERS | 1 + .../content/{ => res}/OverlayConfigIterationRule.java | 4 ++-- .../android/internal/content/{ => res}/OverlayConfigTest.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 core/tests/coretests/apks/overlay_config/OWNERS create mode 100644 core/tests/coretests/src/com/android/internal/content/res/OWNERS rename core/tests/coretests/src/com/android/internal/content/{ => res}/OverlayConfigIterationRule.java (98%) rename core/tests/coretests/src/com/android/internal/content/{ => res}/OverlayConfigTest.java (99%) diff --git a/core/tests/coretests/apks/overlay_config/OWNERS b/core/tests/coretests/apks/overlay_config/OWNERS new file mode 100644 index 0000000000000..3e79d8ff0bbe3 --- /dev/null +++ b/core/tests/coretests/apks/overlay_config/OWNERS @@ -0,0 +1 @@ +include /core/java/android/content/res/OWNERS diff --git a/core/tests/coretests/src/com/android/internal/content/res/OWNERS b/core/tests/coretests/src/com/android/internal/content/res/OWNERS new file mode 100644 index 0000000000000..3e79d8ff0bbe3 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/content/res/OWNERS @@ -0,0 +1 @@ +include /core/java/android/content/res/OWNERS diff --git a/core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java similarity index 98% rename from core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java rename to core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java index a01459f20f6b3..c50c818be716a 100644 --- a/core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java +++ b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2021 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.content; +package com.android.internal.content.res; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; diff --git a/core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java similarity index 99% rename from core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java rename to core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java index dee118fbe0fe3..178c2dd5b0629 100644 --- a/core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java +++ b/core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2021 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.content; +package com.android.internal.content.res; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;