diff options
| author | cretin45 <cretin45@gmail.com> | 2015-01-30 15:26:08 -0800 |
|---|---|---|
| committer | cretin45 <cretin45@gmail.com> | 2015-01-30 15:26:08 -0800 |
| commit | 7e9af47d04f9928d428d6eb6ed39f321816de774 (patch) | |
| tree | 6c5c91ea6212606c335f4189b9f671b9ec431882 /tests | |
| parent | fa88fbad19c88988df256aebf1a121583a631249 (diff) | |
| download | packages_apps_SetupWizard-7e9af47d04f9928d428d6eb6ed39f321816de774.tar.gz packages_apps_SetupWizard-7e9af47d04f9928d428d6eb6ed39f321816de774.tar.bz2 packages_apps_SetupWizard-7e9af47d04f9928d428d6eb6ed39f321816de774.zip | |
SetupWizardTests: Don't crash when there is no GMS
Change-Id: I0bc86384c172c0abb7960f140b9155e75264957c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java index 455503f..852f979 100644 --- a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java +++ b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java @@ -59,24 +59,32 @@ public class ManualTestActivity extends Activity { final PackageManager pm = getPackageManager(); ComponentName componentName = new ComponentName("com.cyanogenmod.setupwizard", "com.cyanogenmod.setupwizard.ui.SetupWizardActivity"); pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); - componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); - pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + try { + componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); + pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + } catch (Exception e) { + e.printStackTrace(); + } intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags()); startActivity(intent); finish(); } private void enableGoogleSetup() { - Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0); - Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0); - Intent intent = new Intent("android.intent.action.MAIN"); - intent.addCategory("android.intent.category.HOME"); - final PackageManager pm = getPackageManager(); - ComponentName componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); - pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags()); - startActivity(intent); - finish(); + try { + Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0); + Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0); + Intent intent = new Intent("android.intent.action.MAIN"); + intent.addCategory("android.intent.category.HOME"); + final PackageManager pm = getPackageManager(); + ComponentName componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); + pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags()); + startActivity(intent); + finish(); + } catch (Exception e) { + e.printStackTrace(); + } } private void setSetupComplete() { @@ -87,8 +95,12 @@ public class ManualTestActivity extends Activity { final PackageManager pm = getPackageManager(); ComponentName componentName = new ComponentName("com.cyanogenmod.setupwizard", "com.cyanogenmod.setupwizard.ui.SetupWizardActivity"); pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); - componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); - pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + try { + componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity"); + pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); + } catch (Exception e) { + e.printStackTrace(); + } intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags()); startActivity(intent); finish(); |