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

Commit 5f0d0d5c authored by Reema Bajwa's avatar Reema Bajwa Committed by Automerger Merge Worker
Browse files

Merge "Guard setting of remote entry with a permission" into udc-dev am: 59830725 

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



Change-Id: I1aaa3c61a91db25c21716728aba2a74ff8b15563
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 468598c9 59830725

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -40549,7 +40549,7 @@ package android.service.credentials { 
    method @NonNull public android.service.credentials.BeginCreateCredentialResponse.Builder addCreateEntry(@NonNull android.service.credentials.CreateEntry);

    method @NonNull public android.service.credentials.BeginCreateCredentialResponse build();

    method @NonNull public android.service.credentials.BeginCreateCredentialResponse.Builder setCreateEntries(@NonNull java.util.List<android.service.credentials.CreateEntry>);

    method @NonNull public android.service.credentials.BeginCreateCredentialResponse.Builder setRemoteCreateEntry(@Nullable android.service.credentials.RemoteEntry);

    method @NonNull @RequiresPermission("android.permission.PROVIDE_REMOTE_CREDENTIALS") public android.service.credentials.BeginCreateCredentialResponse.Builder setRemoteCreateEntry(@Nullable android.service.credentials.RemoteEntry);

  }















  public class BeginGetCredentialOption implements android.os.Parcelable {










@@ -40598,7 +40598,7 @@ package android.service.credentials {













    method @NonNull public android.service.credentials.BeginGetCredentialResponse.Builder setActions(@NonNull java.util.List<android.service.credentials.Action>);















    method @NonNull public android.service.credentials.BeginGetCredentialResponse.Builder setAuthenticationActions(@NonNull java.util.List<android.service.credentials.Action>);















    method @NonNull public android.service.credentials.BeginGetCredentialResponse.Builder setCredentialEntries(@NonNull java.util.List<android.service.credentials.CredentialEntry>);













    method @NonNull public android.service.credentials.BeginGetCredentialResponse.Builder setRemoteCredentialEntry(@Nullable android.service.credentials.RemoteEntry);













    method @NonNull @RequiresPermission("android.permission.PROVIDE_REMOTE_CREDENTIALS") public android.service.credentials.BeginGetCredentialResponse.Builder setRemoteCredentialEntry(@Nullable android.service.credentials.RemoteEntry);















  }





























  public final class CallingAppInfo implements android.os.Parcelable {

























core/api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -254,7 +254,7 @@ package android {













    field public static final String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";















    field public static final String POWER_SAVER = "android.permission.POWER_SAVER";















    field public static final String PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE = "android.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE";













    field public static final String PROVIDE_HYBRID_CREDENTIAL_SERVICE = "android.permission.PROVIDE_HYBRID_CREDENTIAL_SERVICE";













    field public static final String PROVIDE_REMOTE_CREDENTIALS = "android.permission.PROVIDE_REMOTE_CREDENTIALS";















    field public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";















    field public static final String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";















    field public static final String PROVISION_DEMO_DEVICE = "android.permission.PROVISION_DEMO_DEVICE";

























core/java/android/service/credentials/BeginCreateCredentialResponse.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -16,8 +16,10 @@





























package android.service.credentials;





























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.RequiresPermission;















import android.os.Parcel;















import android.os.Parcelable;


























@@ -137,7 +139,17 @@ public final class BeginCreateCredentialResponse implements Parcelable {













         * result should be set to {@link android.app.Activity#RESULT_OK} and an extra with the















         * {@link CredentialProviderService#EXTRA_CREATE_CREDENTIAL_RESPONSE} key should be populated















         * with a {@link android.credentials.CreateCredentialResponse} object.













         *













         * <p> Note that as a provider service you will only be able to set a remote entry if :













         * - Provider service possesses the













         * {@link Manifest.permission.PROVIDE_REMOTE_CREDENTIALS} permission.













         * - Provider service is configured as the provider that can provide remote entries.













         *













         * If the above conditions are not met, setting back {@link BeginCreateCredentialResponse}













         * on the callback from {@link CredentialProviderService#onBeginCreateCredential}













         * will throw a {@link SecurityException}.















         */













        @RequiresPermission(Manifest.permission.PROVIDE_REMOTE_CREDENTIALS)















        public @NonNull Builder setRemoteCreateEntry(@Nullable RemoteEntry remoteCreateEntry) {















            mRemoteCreateEntry = remoteCreateEntry;















            return this;

































core/java/android/service/credentials/BeginGetCredentialResponse.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -16,8 +16,10 @@





























package android.service.credentials;





























import android.Manifest;















import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.RequiresPermission;















import android.os.Parcel;















import android.os.Parcelable;


























@@ -154,7 +156,17 @@ public final class BeginGetCredentialResponse implements Parcelable {













         * result should be set to {@link android.app.Activity#RESULT_OK} and an extra with the















         * {@link CredentialProviderService#EXTRA_GET_CREDENTIAL_RESPONSE} key should be populated















         * with a {@link android.credentials.Credential} object.













         *













         * <p> Note that as a provider service you will only be able to set a remote entry if :













         * - Provider service possesses the













         * {@link Manifest.permission.PROVIDE_REMOTE_CREDENTIALS} permission.













         * - Provider service is configured as the provider that can provide remote entries.













         *













         * If the above conditions are not met, setting back {@link BeginGetCredentialResponse}













         * on the callback from {@link CredentialProviderService#onBeginGetCredential} will













         * throw a {@link SecurityException}.















         */













        @RequiresPermission(Manifest.permission.PROVIDE_REMOTE_CREDENTIALS)















        public @NonNull Builder setRemoteCredentialEntry(@Nullable RemoteEntry















                remoteCredentialEntry) {















            mRemoteCredentialEntry = remoteCredentialEntry;

































core/java/android/service/credentials/CredentialProviderService.java



+20
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.service.credentials;





























import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;





























import android.Manifest;















import android.annotation.CallSuper;















import android.annotation.NonNull;















import android.annotation.SdkConstant;










@@ -218,6 +219,11 @@ public abstract class CredentialProviderService extends Service {













                            GetCredentialException>() {















                        @Override















                        public void onResult(BeginGetCredentialResponse result) {













                            // If provider service does not possess the HYBRID permission, this













                            // check will throw an exception in the provider process.













                            if (result.getRemoteCredentialEntry() != null) {













                                enforceRemoteEntryPermission();













                            }















                            try {















                                callback.onSuccess(result);















                            } catch (RemoteException e) {









@@ -236,6 +242,15 @@ public abstract class CredentialProviderService extends Service {













            ));















            return transport;















        }













        private void enforceRemoteEntryPermission() {













            String permission =













                    Manifest.permission.PROVIDE_REMOTE_CREDENTIALS;













            getApplicationContext().enforceCallingOrSelfPermission(













                    permission,













                    String.format("Provider must have %s, in order to set a "













                            + "remote entry", permission)













            );













        }































        @Override















        public ICancellationSignal onBeginCreateCredential(BeginCreateCredentialRequest request,









@@ -253,6 +268,11 @@ public abstract class CredentialProviderService extends Service {













                            BeginCreateCredentialResponse, CreateCredentialException>() {















                        @Override















                        public void onResult(BeginCreateCredentialResponse result) {













                            // If provider service does not possess the HYBRID permission, this













                            // check will throw an exception in the provider process.













                            if (result.getRemoteCreateEntry() != null) {













                                enforceRemoteEntryPermission();













                            }















                            try {















                                callback.onSuccess(result);















                            } catch (RemoteException e) {