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

Show different error screen for PS creation based on error

Browse Source 
This contains the change to show a different fragment on private space
creation error based on the error code returned by UserManager.
On private space create error checks for the returned error code and if
PS is not supported on the device showns error screen containing a link to Help
Center atricle to find out more about the reason for profile creation
failure.

ACTION_PRIVATE_SPACE_SETUP_SPACE_ERRORS metric is logged with the error
code on create error else 0 on sucessful space creation.

Recording: b/340130375#comment17

Bug: 340130375
Test: Manual
Flag: android.multiuser.show_different_creation_error_for_unsupported_devices
Change-Id: Ifa0345fb6aad64599009f8aa79d168f57fd35c03
This commit is contained in:
josephpv
2024-07-24 14:20:11 +00:00
committed by Joseph Vincent
parent b6e0cd99c1
commit af87233e1e
5 changed files with 149 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/privatespace/PrivateSpaceCreationFragment.java
View File

@@ -29,6 +29,7 @@ import android.net.NetworkInfo;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.UserManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -49,6 +50,7 @@ public class PrivateSpaceCreationFragment extends InstrumentedFragment {
private static final String TAG = "PrivateSpaceCreateFrag";
private static final int PRIVATE_SPACE_CREATE_POST_DELAY_MS = 1000;
private static final int PRIVATE_SPACE_ACCOUNT_LOGIN_POST_DELAY_MS = 5000;
private static final int PRIVATE_SPACE_SETUP_NO_ERROR = 0;
private static final Handler sHandler = new Handler(Looper.getMainLooper());
private Runnable mRunnable =
() -> {
@@ -122,6 +124,11 @@ public class PrivateSpaceCreationFragment extends InstrumentedFragment {
Log.i(TAG, "Private Space created");
mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_SPACE_CREATED, true);
if (android.multiuser.Flags.showDifferentCreationErrorForUnsupportedDevices()) {
mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_SPACE_ERRORS,
PRIVATE_SPACE_SETUP_NO_ERROR);
}
if (isConnectedToInternet()) {
registerReceiver();
sHandler.postDelayed(
@@ -132,8 +139,18 @@ public class PrivateSpaceCreationFragment extends InstrumentedFragment {
}
} else {
mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_SPACE_CREATED, false);
showPrivateSpaceErrorScreen();
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_SPACE_CREATED,
false);
if (android.multiuser.Flags.showDifferentCreationErrorForUnsupportedDevices()) {
int errorCode = PrivateSpaceMaintainer.getInstance(
getActivity()).getPrivateSpaceCreateError();
mMetricsFeatureProvider.action(
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_SPACE_ERRORS,
errorCode);
showPrivateSpaceErrorScreen(errorCode);
} else {
showPrivateSpaceErrorScreen();
}
}
}
@@ -147,6 +164,16 @@ public class PrivateSpaceCreationFragment extends InstrumentedFragment {
.navigate(R.id.action_create_profile_error);
}
private void showPrivateSpaceErrorScreen(int errorCode) {
if (errorCode == UserManager.USER_OPERATION_ERROR_USER_RESTRICTED
|| errorCode == UserManager.USER_OPERATION_ERROR_PRIVATE_PROFILE) {
NavHostFragment.findNavController(PrivateSpaceCreationFragment.this)
.navigate(R.id.action_create_profile_error_restrict);
} else {
showPrivateSpaceErrorScreen();
}
}
/** Returns true if device has an active internet connection, false otherwise. */
private boolean isConnectedToInternet() {
ConnectivityManager cm =