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

Commit d59c0471 authored by Colin Cross's avatar Colin Cross
Browse files

Fix CredentialManager for use_resource_processor: true 

CredentialManagerShared was using the same Android package name as
CredentialManager-handheld, which caused the R classes to be shadowed
when use_resource_processor: true is enabled.  Use a unique Android
package for CredentialManagerShared.

Bug: 294256649
Test: m javac-check
Change-Id: I07fea5636c6ca8f6752a11ca230e04ee172b140b
parent b6e4f098

packages/CredentialManager/shared/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.credentialmanager">

    package="com.android.credentialmanager.shared">



</manifest>

packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/CredentialKtx.kt

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ import androidx.credentials.provider.PasswordCredentialEntry 
import androidx.credentials.provider.PublicKeyCredentialEntry

import androidx.credentials.provider.RemoteEntry

import com.android.credentialmanager.IS_AUTO_SELECTED_KEY

import com.android.credentialmanager.R

import com.android.credentialmanager.model.get.ActionEntryInfo

import com.android.credentialmanager.model.get.AuthenticationEntryInfo

import com.android.credentialmanager.model.get.CredentialEntryInfo

import com.android.credentialmanager.model.CredentialType

import com.android.credentialmanager.model.get.ProviderInfo

import com.android.credentialmanager.model.get.RemoteEntryInfo

import com.android.credentialmanager.shared.R

import com.android.credentialmanager.TAG

import com.android.credentialmanager.model.EntryInfo