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

Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb08177edbc36071cfb2128cd05f514224b90d48
This commit is contained in:
TreeHugger Robot
2021-03-03 13:03:30 +00:00
committed by Automerger Merge Worker
parent 4399c4af3c 42ac293a53
commit 0a4b9635af
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/security/RequestManageCredentials.java
View File

@@ -208,7 +208,7 @@ public class RequestManageCredentials extends Activity {
.write(); .write();
finishWithResultCancelled(); finishWithResultCancelled();
}); });
allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementApp()); allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementAppAndFinish());
} }
private void loadExtendedFloatingActionButton() { private void loadExtendedFloatingActionButton() {
@@ -220,13 +220,14 @@ public class RequestManageCredentials extends Activity {
}); });
} }
private void setOrUpdateCredentialManagementApp() { private void setOrUpdateCredentialManagementAppAndFinish() {
try { try {
mKeyChainConnection.getService().setCredentialManagementApp( mKeyChainConnection.getService().setCredentialManagementApp(
mCredentialManagerPackage, mAuthenticationPolicy); mCredentialManagerPackage, mAuthenticationPolicy);
DevicePolicyEventLogger DevicePolicyEventLogger
.createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REQUEST_ACCEPTED) .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REQUEST_ACCEPTED)
.write(); .write();
setResult(RESULT_OK);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Unable to set credential manager app", e); Log.e(TAG, "Unable to set credential manager app", e);
logRequestFailure(); logRequestFailure();