PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when launching about phone v2 through intent

Browse Source 
Change-Id: Ife6c24a7127fc9821760f9f5b58a33437711bc25
Fixes: 73971752
Test: atest
This commit is contained in:
Fan Zhang
2018-02-28 10:03:43 -08:00
parent 6a6cc310cf
commit cfd79a9a7a
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java
View File

@@ -52,10 +52,8 @@ public class AboutPhoneSettingsTests {
// TODO: retrieve using name/ids from com.android.settings package
private static final String[] sResourceTexts = {
"Phone number",
"SIM status",
"Model & hardware",
"MEID",
"Android version"
"Legal information",
"Regulatory labels"
};
private UiDevice mDevice;
@@ -94,11 +92,11 @@ public class AboutPhoneSettingsTests {
}
@Test
public void testAllMenuEntriesExist() throws Exception {
public void testAllMenuEntriesExist() {
searchForItemsAndTakeAction(mDevice, sResourceTexts);
}
private void launchAboutPhoneSettings(String aboutSetting) throws Exception {
private void launchAboutPhoneSettings(String aboutSetting) {
Intent aboutIntent = new Intent(aboutSetting);
aboutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
InstrumentationRegistry.getTargetContext().startActivity(aboutIntent);
@@ -107,8 +105,7 @@ public class AboutPhoneSettingsTests {
/**
* Removes items found in the view and optionally takes some action.
*/
private void removeItemsAndTakeAction(UiDevice device, ArrayList<String> itemsLeftToFind)
throws Exception {
private void removeItemsAndTakeAction(UiDevice device, ArrayList<String> itemsLeftToFind) {
for (Iterator<String> iterator = itemsLeftToFind.iterator(); iterator.hasNext(); ) {
String itemText = iterator.next();
UiObject2 item = device.wait(Until.findObject(By.text(itemText)), TIMEOUT);
@@ -124,8 +121,7 @@ public class AboutPhoneSettingsTests {
* <p>Will scroll down the screen until it has found all elements or reached the bottom.
* This allows elements to be found and acted on even if they change order.
*/
private void searchForItemsAndTakeAction(UiDevice device, String[] itemsToFind)
throws Exception {
private void searchForItemsAndTakeAction(UiDevice device, String[] itemsToFind) {
ArrayList<String> itemsLeftToFind = new ArrayList<>(Arrays.asList(itemsToFind));
assertWithMessage("There must be at least one item to search for on the screen!")