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

Check bluetooth status when relevant

Browse Source 
Change-Id: Ie67a28cb89bf68ef0d57f36ee2d875cfc44e29cc
This commit is contained in:
Oliver Scott
2024-07-16 21:25:29 -04:00
committed by Bruno Martins
parent 5584669c2e
commit ddd0c8d7ac
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/lineageos/setupwizard/BluetoothSetupActivity.java
View File

@@ -7,6 +7,7 @@
package org.lineageos.setupwizard; package org.lineageos.setupwizard;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND; import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
@@ -26,6 +27,10 @@ public class BluetoothSetupActivity extends SubBaseActivity {
@Override @Override
protected void onStartSubactivity() { protected void onStartSubactivity() {
if (!SetupWizardUtils.hasLeanback(this) || SetupWizardUtils.isBluetoothDisabled()) {
finishAction(RESULT_SKIP);
return;
}
try { try {
Intent intent = new Intent(ACTION_CONNECT_INPUT); Intent intent = new Intent(ACTION_CONNECT_INPUT);
intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true); intent.putExtra(INTENT_EXTRA_NO_INPUT_MODE, true);

5
src/org/lineageos/setupwizard/util/SetupWizardUtils.java
View File

@@ -51,7 +51,6 @@ import android.telephony.TelephonyManager;
import android.util.Log; import android.util.Log;
import org.lineageos.setupwizard.BaseSetupWizardActivity; import org.lineageos.setupwizard.BaseSetupWizardActivity;
import org.lineageos.setupwizard.BluetoothSetupActivity;
import org.lineageos.setupwizard.SetupWizardApp; import org.lineageos.setupwizard.SetupWizardApp;
import java.io.File; import java.io.File;
@@ -233,9 +232,7 @@ public class SetupWizardUtils {
} }
public static void disableComponentsForMissingFeatures(Context context) { public static void disableComponentsForMissingFeatures(Context context) {
if (!hasLeanback(context) || isBluetoothDisabled()) {
disableComponent(context, BluetoothSetupActivity.class);
}
} }
/** /**