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

Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev

Browse Source
This commit is contained in:
James O'Leary
2022-04-22 20:23:28 +00:00
committed by Android (Google) Code Review
parent ca46e52c30 ca014a873b
commit b2af04737d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
View File

@@ -3073,8 +3073,15 @@ public class ChooserActivityTest {
// framework code on the device is up-to-date. // framework code on the device is up-to-date.
// TODO: is there a better way to do this? (Other than abandoning inheritance-based DI wrapper?) // TODO: is there a better way to do this? (Other than abandoning inheritance-based DI wrapper?)
private int getRuntimeResourceId(String name, String defType) { private int getRuntimeResourceId(String name, String defType) {
int id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android"); int id = -1;
if (ChooserActivityOverrideData.getInstance().resources != null) {
id = ChooserActivityOverrideData.getInstance().resources.getIdentifier(
name, defType, "android");
} else {
id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android");
}
assertThat(id, greaterThan(0)); assertThat(id, greaterThan(0));
return id; return id;
} }
} }