Merge "Fix small issue in selection logic Test: Locally built & deployed"
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
package com.android.server.credentials;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.credentials.ui.IntentFactory;
|
||||
@@ -48,7 +47,7 @@ public class CredentialManagerUi {
|
||||
};
|
||||
|
||||
private void handleUiResult(int resultCode, Bundle resultData) {
|
||||
if (resultCode == Activity.RESULT_OK) {
|
||||
if (resultCode == UserSelectionDialogResult.RESULT_CODE_DIALOG_COMPLETE_WITH_SELECTION) {
|
||||
UserSelectionDialogResult selection = UserSelectionDialogResult
|
||||
.fromResultData(resultData);
|
||||
if (selection != null) {
|
||||
@@ -56,7 +55,7 @@ public class CredentialManagerUi {
|
||||
} else {
|
||||
Slog.i(TAG, "No selection found in UI result");
|
||||
}
|
||||
} else if (resultCode == Activity.RESULT_CANCELED) {
|
||||
} else if (resultCode == UserSelectionDialogResult.RESULT_CODE_DIALOG_CANCELED) {
|
||||
mCallbacks.onUiCancelation();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user