Merge "Fix bug in credential manager settings"

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

@@ -247,6 +247,8 @@ public final class CredentialManagerService
             return cancelTransport;
         }
 
+	@SuppressWarnings("GuardedBy") // ErrorProne requires listEnabledProviders
+        // to be guarded by 'service.mLock', which is the same as mLock.
         @Override
         public ICancellationSignal listEnabledProviders(IListEnabledProvidersCallback callback) {
             Log.i(TAG, "listEnabledProviders");
@@ -256,7 +258,7 @@ public final class CredentialManagerService
             runForUser(
                     (service) -> {
                         enabledProviders.add(
-                                service.getServiceInfo().getComponentName().flattenToString());
+                                service.getComponentName().flattenToString());
                     });
 
             // Call the callback.

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

@@ -53,6 +53,11 @@ public final class CredentialManagerServiceImpl extends
         }
     }
 
+    @GuardedBy("mLock")
+    public ComponentName getComponentName() {
+        return mInfo.getServiceInfo().getComponentName();
+    }
+
     @Override // from PerUserSystemService
     @GuardedBy("mLock")
     protected ServiceInfo newServiceInfoLocked(@NonNull ComponentName serviceComponent)