Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a5aa465 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revamp logging for Credential Manager" into main

parents 807c002d 708c1949

core/java/android/credentials/CredentialManager.java

+3 −1
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ import java.util.concurrent.Executor; 
@SystemService(Context.CREDENTIAL_SERVICE)

@RequiresFeature(PackageManager.FEATURE_CREDENTIALS)

public final class CredentialManager {

    private static final String TAG = "CredentialManager";

    /** @hide **/

    @Hide

    public static final String TAG = "CredentialManager";

    private static final Bundle OPTIONS_SENDER_BAL_OPTIN = ActivityOptions.makeBasic()

            .setPendingIntentBackgroundActivityStartMode(

                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED).toBundle();

core/java/android/service/credentials/CredentialProviderInfoFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ import java.util.Set; 
 * @hide

 */

public final class CredentialProviderInfoFactory {

    private static final String TAG = "CredentialProviderInfoFactory";

    private static final String TAG = CredentialManager.TAG;



    private static final String TAG_CREDENTIAL_PROVIDER = "credential-provider";

    private static final String TAG_CAPABILITIES = "capabilities";

services/credentials/java/com/android/server/credentials/ClearRequestSession.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.credentials.ClearCredentialStateException;

import android.credentials.ClearCredentialStateRequest;

import android.credentials.CredentialManager;

import android.credentials.CredentialProviderInfo;

import android.credentials.IClearCredentialStateCallback;

import android.credentials.selection.ProviderData;
@@ -41,7 +42,7 @@ import java.util.Set; 
public final class ClearRequestSession extends RequestSession<ClearCredentialStateRequest,

        IClearCredentialStateCallback, Void>

        implements ProviderSession.ProviderInternalCallback<Void> {

    private static final String TAG = "GetRequestSession";

    private static final String TAG = CredentialManager.TAG;



    public ClearRequestSession(Context context, RequestSession.SessionLifetime sessionCallback,

            Object lock, int userId, int callingUid,

services/credentials/java/com/android/server/credentials/CreateRequestSession.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import java.util.Set; 
public final class CreateRequestSession extends RequestSession<CreateCredentialRequest,

        ICreateCredentialCallback, CreateCredentialResponse>

        implements ProviderSession.ProviderInternalCallback<CreateCredentialResponse> {

    private static final String TAG = "CreateRequestSession";

    private static final String TAG = CredentialManager.TAG;

    private final Set<ComponentName> mPrimaryProviders;



    CreateRequestSession(@NonNull Context context, RequestSession.SessionLifetime sessionCallback,

services/credentials/java/com/android/server/credentials/CredentialManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.pm.PackageManager; 
import android.credentials.ClearCredentialStateRequest;

import android.credentials.CreateCredentialException;

import android.credentials.CreateCredentialRequest;

import android.credentials.CredentialManager;

import android.credentials.CredentialOption;

import android.credentials.CredentialProviderInfo;

import android.credentials.GetCandidateCredentialsException;
@@ -92,7 +93,7 @@ public final class CredentialManagerService 
        extends AbstractMasterSystemService<

        CredentialManagerService, CredentialManagerServiceImpl> {



    private static final String TAG = "CredManSysService";

    private static final String TAG = CredentialManager.TAG;

    private static final String PERMISSION_DENIED_ERROR = "permission_denied";

    private static final String PERMISSION_DENIED_WRITE_SECURE_SETTINGS_ERROR =

            "Caller is missing WRITE_SECURE_SETTINGS permission";