Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing Resources OWNERS to FrameworksCoreTests" into sc-dev am: 44eb75f6ed am: db9df0b0d5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14826388

Change-Id: I9fafc0a34822205ab0e8992acfefad2dda001b22
This commit is contained in:
Winson Chiu
2021-06-07 19:01:21 +00:00
committed by Automerger Merge Worker
parent db56287006 db9df0b0d5
commit ecd2cb72d3
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/coretests/apks/overlay_config/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /core/java/android/content/res/OWNERS

1
core/tests/coretests/src/com/android/internal/content/res/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /core/java/android/content/res/OWNERS

4
core/tests/coretests/src/com/android/internal/content/OverlayConfigIterationRule.java → core/tests/coretests/src/com/android/internal/content/res/OverlayConfigIterationRule.java
View File

@@ -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;

4
core/tests/coretests/src/com/android/internal/content/OverlayConfigTest.java → core/tests/coretests/src/com/android/internal/content/res/OverlayConfigTest.java
View File

@@ -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;