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

Add API to query managed profiles

Browse Source 
Replace mIsPrimaryUser and UserManager calls with API

Change-Id: I4c9661c6daf3dcb714db01d5229bf4cee37648c2
This commit is contained in:
Oliver Scott
2022-12-05 15:24:54 +01:00
committed by Michael Bestas
parent 0002daed48
commit fb6285a35e
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
View File

@@ -88,7 +88,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
protected boolean mIsExiting = false; protected boolean mIsExiting = false;
private final boolean mIsFirstRun = true; private final boolean mIsFirstRun = true;
protected boolean mIsGoingBack = false; protected boolean mIsGoingBack = false;
private boolean mIsPrimaryUser;
protected int mResultCode = 0; protected int mResultCode = 0;
private Intent mResultData; private Intent mResultData;
@@ -112,7 +111,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
registerReceiver(finishReceiver, new IntentFilter(ACTION_SETUP_COMPLETE)); registerReceiver(finishReceiver, new IntentFilter(ACTION_SETUP_COMPLETE));
mIsPrimaryUser = UserHandle.myUserId() == 0;
initLayout(); initLayout();
mNavigationBar = getNavigationBar(); mNavigationBar = getNavigationBar();
if (mNavigationBar != null) { if (mNavigationBar != null) {
@@ -520,10 +518,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
return mIsFirstRun; return mIsFirstRun;
} }
protected boolean isPrimaryUser() {
return mIsPrimaryUser;
}
public boolean hasMultipleUsers() { public boolean hasMultipleUsers() {
return ((UserManager) getSystemService(USER_SERVICE)).getUsers().size() > 1; return ((UserManager) getSystemService(USER_SERVICE)).getUsers().size() > 1;
} }

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

@@ -26,7 +26,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager;
import android.util.Log; import android.util.Log;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -53,9 +52,9 @@ public class SetupWizardActivity extends BaseSetupWizardActivity {
onSetupStart(); onSetupStart();
SetupWizardUtils.enableComponent(this, WizardManager.class); SetupWizardUtils.enableComponent(this, WizardManager.class);
Intent intent = new Intent(ACTION_LOAD); Intent intent = new Intent(ACTION_LOAD);
if (isPrimaryUser()) { if (SetupWizardUtils.isOwner()) {
intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri)); intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
} else if (getSystemService(UserManager.class).isManagedProfile()) { } else if (SetupWizardUtils.isManagedProfile(this)) {
intent.putExtra(EXTRA_SCRIPT_URI, getString( intent.putExtra(EXTRA_SCRIPT_URI, getString(
R.string.lineage_wizard_script_managed_profile_uri)); R.string.lineage_wizard_script_managed_profile_uri));
} else { } else {

3
src/org/lineageos/setupwizard/SetupWizardExitActivity.java
View File

@@ -24,7 +24,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager;
import android.util.Log; import android.util.Log;
import org.lineageos.setupwizard.util.PhoneMonitor; import org.lineageos.setupwizard.util.PhoneMonitor;
@@ -44,7 +43,7 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity {
SetupWizardUtils.enableCaptivePortalDetection(this); SetupWizardUtils.enableCaptivePortalDetection(this);
} }
PhoneMonitor.onSetupFinished(); PhoneMonitor.onSetupFinished();
if (!getSystemService(UserManager.class).isManagedProfile()) { if (!SetupWizardUtils.isManagedProfile(this)) {
launchHome(); launchHome();
} }
finish(); finish();

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

@@ -46,6 +46,7 @@ import android.net.ConnectivityManager;
import android.os.Binder; import android.os.Binder;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
@@ -143,6 +144,10 @@ public class SetupWizardUtils {
return UserHandle.myUserId() == 0; return UserHandle.myUserId() == 0;
} }
public static boolean isManagedProfile(Context context) {
return context.getSystemService(UserManager.class).isManagedProfile();
}
public static void disableCaptivePortalDetection(Context context) { public static void disableCaptivePortalDetection(Context context) {
Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 0); Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 0);
} }