From 3978c308173dcf023d16c8722104b5a6b6937a23 Mon Sep 17 00:00:00 2001 From: josephpv Date: Tue, 9 Apr 2024 23:33:50 +0000 Subject: [PATCH] Handle private space account login skip result Bug: 320460786 Test: Manual Change-Id: I59ad178a7925ef1680e67deb5321ec6d0c702e73 --- .../PrivateProfileContextHelperActivity.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java index 416b2dd7105..ef33d11f012 100644 --- a/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java +++ b/src/com/android/settings/privatespace/PrivateProfileContextHelperActivity.java @@ -96,13 +96,24 @@ public class PrivateProfileContextHelperActivity extends FragmentActivity { } 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"); - setResult(RESULT_OK); + } else if (resultCode == RESULT_FIRST_USER) { + Log.i(TAG, "private space account login skipped"); } else { Log.i(TAG, "private space account login failed"); - setResult(RESULT_CANCELED); } + setResult( + resultCode == RESULT_OK || resultCode == RESULT_FIRST_USER + ? RESULT_OK + : RESULT_CANCELED); finish(); }