summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-02-10 16:31:04 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-02-11 00:48:21 +0000
commit6ea46dd6d8b57cbabd2c22940a98770a2f094985 (patch)
treedd24f97a6ebaabe8304fc07adc63362ae2094534 /tests
parente12f85551eae9d693a954f80492924382b5ddd09 (diff)
downloadpackages_apps_SetupWizard-6ea46dd6d8b57cbabd2c22940a98770a2f094985.zip
packages_apps_SetupWizard-6ea46dd6d8b57cbabd2c22940a98770a2f094985.tar.gz
packages_apps_SetupWizard-6ea46dd6d8b57cbabd2c22940a98770a2f094985.tar.bz2
SetupWizardTests: Underp re-enabling GMS setup
Change-Id: I13d38acd8d5875a71375ceec51f284fa58605989
Diffstat (limited to 'tests')
-rw-r--r--tests/AndroidManifest.xml1
-rw-r--r--tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java76
2 files changed, 26 insertions, 51 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 5e95a0f..fdb837f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -29,6 +29,7 @@
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
+ <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
<application android:icon="@drawable/icon">
<uses-library android:name="android.test.runner" />
diff --git a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
index bc22a4d..6b489a7 100644
--- a/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
+++ b/tests/src/com/cyanogenmod/account/tests/ManualTestActivity.java
@@ -21,14 +21,11 @@ import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.provider.Settings;
import android.view.View;
import android.widget.Toast;
-import java.util.List;
-
public class ManualTestActivity extends Activity {
public void onCreate(Bundle savedInstanceState) {
@@ -58,23 +55,17 @@ public class ManualTestActivity extends Activity {
private void enableSetup() {
Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0);
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.addCategory(Intent.CATEGORY_HOME);
+ Intent intent = new Intent("android.intent.action.MAIN");
+ intent.addCategory("android.intent.category.HOME");
final PackageManager pm = getPackageManager();
ComponentName componentName = new ComponentName("com.cyanogenmod.setupwizard", "com.cyanogenmod.setupwizard.ui.SetupWizardActivity");
- pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
try {
- final List<ResolveInfo> resolveInfos =
- pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
- for (ResolveInfo info : resolveInfos) {
- if ("com.google.android.setupwizard".equals(info.activityInfo.packageName)) {
- final ComponentName cn =
- new ComponentName(info.activityInfo.packageName, info.activityInfo.name);
- pm.setComponentEnabledSetting(cn,
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
- 0);
- }
- }
+ componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity");
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+ componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.WizardManager");
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+ pm.clearApplicationUserData("com.google.android.setupwizard", null);
} catch (Exception e) {
Toast.makeText(this, "GMS not installed", Toast.LENGTH_SHORT).show();
e.printStackTrace();
@@ -88,29 +79,19 @@ public class ManualTestActivity extends Activity {
try {
Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0);
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.addCategory(Intent.CATEGORY_HOME);
+ Intent intent = new Intent("android.intent.action.MAIN");
+ intent.addCategory("android.intent.category.HOME");
final PackageManager pm = getPackageManager();
- try {
- final List<ResolveInfo> resolveInfos =
- pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
- for (ResolveInfo info : resolveInfos) {
- if ("com.google.android.setupwizard".equals(info.activityInfo.packageName)) {
- final ComponentName cn =
- new ComponentName(info.activityInfo.packageName, info.activityInfo.name);
- pm.setComponentEnabledSetting(cn,
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
- 0);
- }
- }
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags());
- startActivity(intent);
- finish();
- } catch (Exception e) {
- Toast.makeText(this, "GMS not installed", Toast.LENGTH_SHORT).show();
- e.printStackTrace();
- }
+ 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);
+ componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.WizardManager");
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+ pm.clearApplicationUserData("com.google.android.setupwizard", null);
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | intent.getFlags());
+ startActivity(intent);
+ finish();
} catch (Exception e) {
+ Toast.makeText(this, "GMS not installed", Toast.LENGTH_SHORT).show();
e.printStackTrace();
}
}
@@ -118,23 +99,16 @@ public class ManualTestActivity extends Activity {
private void setSetupComplete() {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
Settings.Global.putInt(getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.addCategory(Intent.CATEGORY_HOME);
+ Intent intent = new Intent("android.intent.action.MAIN");
+ intent.addCategory("android.intent.category.HOME");
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);
try {
- final List<ResolveInfo> resolveInfos =
- pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
- for (ResolveInfo info : resolveInfos) {
- if ("com.google.android.setupwizard".equals(info.activityInfo.packageName)) {
- final ComponentName cn =
- new ComponentName(info.activityInfo.packageName, info.activityInfo.name);
- pm.setComponentEnabledSetting(cn,
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
- 0);
- }
- }
+ componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.SetupWizardActivity");
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+ componentName = new ComponentName("com.google.android.setupwizard", "com.google.android.setupwizard.WizardManager");
+ pm.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
} catch (Exception e) {
Toast.makeText(this, "GMS not installed", Toast.LENGTH_SHORT).show();
e.printStackTrace();
generated by cgit v1.1 at 2024-05-19 05:58:56 +0000