From 1db317b9620c5e5ec371d0caa256530f541f306c Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Wed, 10 Jan 2024 16:30:37 -0500 Subject: [PATCH] Remove old tests Change-Id: I4344408d7e72093606e0cf90ada4f6bc02831a6b --- AndroidManifest.xml | 9 - exit_wizard.sh | 8 +- .../setupwizard/SetupWizardTestActivity.java | 73 ------- start_lineage_wizard.sh | 6 +- start_lineage_wizard_with_gms.sh | 8 +- tests/Android.mk | 31 --- tests/AndroidManifest.xml | 55 ------ ...telist_org.lineageos.setupwizard-tests.xml | 24 --- tests/res/drawable/icon.png | Bin 3876 -> 0 bytes tests/res/layout/setupwizard_test.xml | 40 ---- tests/res/values/strings.xml | 22 --- .../setupwizard/tests/ManualTestActivity.java | 182 ------------------ 12 files changed, 14 insertions(+), 444 deletions(-) delete mode 100644 src/org/lineageos/setupwizard/SetupWizardTestActivity.java delete mode 100644 tests/Android.mk delete mode 100644 tests/AndroidManifest.xml delete mode 100644 tests/privapp_whitelist_org.lineageos.setupwizard-tests.xml delete mode 100644 tests/res/drawable/icon.png delete mode 100644 tests/res/layout/setupwizard_test.xml delete mode 100644 tests/res/values/strings.xml delete mode 100644 tests/src/org/lineageos/setupwizard/tests/ManualTestActivity.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b38649ef..cce6703d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -326,15 +326,6 @@ - - diff --git a/exit_wizard.sh b/exit_wizard.sh index bfdaf8ab..efc3a769 100755 --- a/exit_wizard.sh +++ b/exit_wizard.sh @@ -3,18 +3,18 @@ adb root wait ${!} has_google_suw=$(adb shell pm list packages com.google.android.setupwizard) -adb shell pm enable org.lineageos.setupwizard/org.lineageos.setupwizard.FinishActivity || true +adb shell pm enable org.lineageos.setupwizard/.FinishActivity || true if [[ ! -z "$has_google_suw" ]] then wait ${!} - adb shell pm enable com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity || true + adb shell pm enable com.google.android.setupwizard/.SetupWizardExitActivity || true wait ${!} fi sleep 1 -adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.FinishActivity || true +adb shell am start org.lineageos.setupwizard/.FinishActivity || true if [[ ! -z "$has_google_suw" ]] then wait ${!} sleep 1 - adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity + adb shell am start com.google.android.setupwizard/.SetupWizardExitActivity fi diff --git a/src/org/lineageos/setupwizard/SetupWizardTestActivity.java b/src/org/lineageos/setupwizard/SetupWizardTestActivity.java deleted file mode 100644 index 912964b3..00000000 --- a/src/org/lineageos/setupwizard/SetupWizardTestActivity.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2017 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.setupwizard; - -import static android.content.pm.PackageManager.GET_ACTIVITIES; -import static android.content.pm.PackageManager.GET_RECEIVERS; -import static android.content.pm.PackageManager.GET_SERVICES; -import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; - -import static org.lineageos.setupwizard.SetupWizardApp.LOGV; - -import android.app.Activity; -import android.content.Intent; -import android.net.wifi.WifiConfiguration; -import android.net.wifi.WifiManager; -import android.os.Bundle; -import android.provider.Settings; -import android.util.Log; - -import org.lineageos.setupwizard.util.SetupWizardUtils; - -import java.util.List; - -public class SetupWizardTestActivity extends Activity { - - private static final String TAG = SetupWizardTestActivity.class.getSimpleName(); - - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (LOGV) { - Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState); - } - if (SetupWizardUtils.isOwner()) { - Settings.Global.putInt(getContentResolver(), "device_provisioned", 0); - } - Settings.Secure.putInt(getContentResolver(), "user_setup_complete", 0); - SetupWizardUtils.resetComponentSets(this, GET_ACTIVITIES | - GET_RECEIVERS | GET_SERVICES | MATCH_DISABLED_COMPONENTS); - forgetAllWifi(); - Intent setupIntent = new Intent("android.intent.action.MAIN") - .addCategory("android.intent.category.HOME") - .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION); - SetupWizardUtils.disableComponentsForMissingFeatures(this); - startActivity(setupIntent); - finish(); - } - - private void forgetAllWifi() { - WifiManager wm = getSystemService(WifiManager.class); - if (wm != null) { - List configs = wm.getConfiguredNetworks(); - if (configs != null) { - for (WifiConfiguration config : configs) { - wm.forget(config.networkId, null); - } - } - } - } -} diff --git a/start_lineage_wizard.sh b/start_lineage_wizard.sh index 09ab6d1f..64425390 100755 --- a/start_lineage_wizard.sh +++ b/start_lineage_wizard.sh @@ -2,6 +2,10 @@ adb root wait ${!} +adb shell pm enable org.lineageos.setupwizard || true +wait ${!} +adb shell pm enable org.lineageos.setupwizard/.SetupWizardActivity || true +wait ${!} if adb shell pm list packages | grep com.google.android.setupwizard; then adb shell pm disable com.google.android.setupwizard || true wait ${!} @@ -10,4 +14,4 @@ if adb shell pm list packages | grep com.android.provision; then adb shell pm disable com.android.provision || true wait ${!} fi -adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardTestActivity +adb shell am start -c android.intent.category.HOME org.lineageos.setupwizard/.SetupWizardActivity diff --git a/start_lineage_wizard_with_gms.sh b/start_lineage_wizard_with_gms.sh index 11a533cd..bcee34ac 100755 --- a/start_lineage_wizard_with_gms.sh +++ b/start_lineage_wizard_with_gms.sh @@ -2,13 +2,15 @@ adb root wait ${!} +adb shell pm enable org.lineageos.setupwizard || true +wait ${!} +adb shell pm enable org.lineageos.setupwizard/.SetupWizardActivity || true +wait ${!} adb shell pm enable com.google.android.setupwizard || true wait ${!} if adb shell pm list packages | grep com.android.provision; then adb shell pm disable com.android.provision || true wait ${!} fi -adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardTestActivity -wait ${!} sleep 1 -adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardTestActivity +adb shell am start com.google.android.setupwizard/.SetupWizardTestActivity diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 61db411e..00000000 --- a/tests/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_STATIC_JAVA_LIBRARIES := \ - org.lineageos.platform.internal - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := LineageSetupWizardTests -LOCAL_CERTIFICATE := platform - -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_REQUIRED_MODULES := privapp_whitelist_org.lineageos.setupwizard-tests.xml - -LOCAL_USES_LIBRARIES := android.test.runner - -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE := privapp_whitelist_org.lineageos.setupwizard-tests.xml -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml deleted file mode 100644 index 733fa4b2..00000000 --- a/tests/AndroidManifest.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/privapp_whitelist_org.lineageos.setupwizard-tests.xml b/tests/privapp_whitelist_org.lineageos.setupwizard-tests.xml deleted file mode 100644 index 255596c4..00000000 --- a/tests/privapp_whitelist_org.lineageos.setupwizard-tests.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - diff --git a/tests/res/drawable/icon.png b/tests/res/drawable/icon.png deleted file mode 100644 index 0a2f2e4d8ce78c32fd3dd6b1087f3ed3ebe56b2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3876 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 mP-6btUF*yh%fpk^_WuDnk+3q}32-g|0000 - - - - -