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

Commit 76ea2302 authored by Becca Hughes's avatar Becca Hughes Committed by Automerger Merge Worker
Browse files

Merge "Move DeviceConfig check to Service" into udc-dev am: 5b791819 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22340375



Change-Id: Ie4a0f95b1e8dda68a3fdce6f37618b7ac4822391
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25b5b00a 5b791819

core/java/android/credentials/CredentialManager.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -460,9 +460,17 @@ public final class CredentialManager { 
        return false;

        return false;

    }

    }





    /**

     * Returns whether the service is enabled.

     *

     * @hide

     */

    private boolean isServiceEnabled() {

    private boolean isServiceEnabled() {

        return DeviceConfig.getBoolean(

        try {

                DeviceConfig.NAMESPACE_CREDENTIAL, DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER, true);

            return mService.isServiceEnabled();

        } catch (RemoteException e) {

            return false;

        }

    }

    }





    /**

    /**

core/java/android/credentials/ICredentialManager.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -58,5 +58,7 @@ interface ICredentialManager { 
    List<CredentialProviderInfo> getCredentialProviderServices(in int userId, in int providerFilter);

    List<CredentialProviderInfo> getCredentialProviderServices(in int userId, in int providerFilter);





    List<CredentialProviderInfo> getCredentialProviderServicesForTesting(in int providerFilter);

    List<CredentialProviderInfo> getCredentialProviderServicesForTesting(in int providerFilter);



    boolean isServiceEnabled();

}

}

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -784,6 +784,19 @@ public final class CredentialManagerService 
                    mContext, userId, providerFilter, getEnabledProviders());

                    mContext, userId, providerFilter, getEnabledProviders());

        }

        }





        @Override

        public boolean isServiceEnabled() {

            final long origId = Binder.clearCallingIdentity();

            try {

                return DeviceConfig.getBoolean(

                        DeviceConfig.NAMESPACE_CREDENTIAL,

                        CredentialManager.DEVICE_CONFIG_ENABLE_CREDENTIAL_MANAGER,

                        false);

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

        }



        @SuppressWarnings("GuardedBy") // ErrorProne requires service.mLock which is the same

        @SuppressWarnings("GuardedBy") // ErrorProne requires service.mLock which is the same

        // this.mLock

        // this.mLock

        private Set<ComponentName> getEnabledProviders() {

        private Set<ComponentName> getEnabledProviders() {