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

Merge "Handle private space account login skip result" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-04-10 19:39:17 +00:00
committed by Android (Google) Code Review
parent dd0ff82bf4 3978c30817
commit 357c795cea
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java
View File

@@ -96,13 +96,24 @@ public class PrivateProfileContextHelperActivity extends FragmentActivity {
} }
private void onAccountAdded(@Nullable ActivityResult result) { private void onAccountAdded(@Nullable ActivityResult result) {
if (result != null && result.getResultCode() == RESULT_OK) { if (result == null) {
Log.i(TAG, "private space account login result null");
setResult(RESULT_CANCELED);
finish();
return;
}
final int resultCode = result.getResultCode();
if (resultCode == RESULT_OK) {
Log.i(TAG, "private space account login success"); Log.i(TAG, "private space account login success");
setResult(RESULT_OK); } else if (resultCode == RESULT_FIRST_USER) {
Log.i(TAG, "private space account login skipped");
} else { } else {
Log.i(TAG, "private space account login failed"); Log.i(TAG, "private space account login failed");
setResult(RESULT_CANCELED);
} }
setResult(
resultCode == RESULT_OK || resultCode == RESULT_FIRST_USER
? RESULT_OK
: RESULT_CANCELED);
finish(); finish();
} }