diff options
| author | Winson Chiu <chiuwinson@google.com> | 2021-06-07 18:40:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-07 18:40:52 +0000 |
| commit | 44eb75f6ed9a52b1b07c66e51bde74b3d55fa4fb (patch) | |
| tree | 322793be76de0010a196c2e96d4cd055ae42dc54 | |
| parent | 51075f3b2bd1b090a9217a874484432d99c43b31 (diff) | |
| parent | ada0d396e40f665eb24b4973c2881f231027ab2d (diff) | |
Merge "Add missing Resources OWNERS to FrameworksCoreTests" into sc-dev
| -rw-r--r-- | core/tests/coretests/apks/overlay_config/OWNERS | 1 | ||||
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/content/res/OWNERS | 1 | ||||
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java (renamed from core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java) | 4 | ||||
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java (renamed from core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java) | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/core/tests/coretests/apks/overlay_config/OWNERS b/core/tests/coretests/apks/overlay_config/OWNERS new file mode 100644 index 000000000000..3e79d8ff0bbe --- /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 000000000000..3e79d8ff0bbe --- /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 index a01459f20f6b..c50c818be716 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 index dee118fbe0fe..178c2dd5b062 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; |