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

Commit f3fcfcc7 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156 am:... 

Merge "Keystore 2.0: Disable BackendBusyException." am: 11c25156 am: 5c1c388b am: 5f23e40e am: 048f9ac0

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

Change-Id: Ic047c0f12aef6c643aefbe2d77c760ad59c36096
parents 8d3afd99 048f9ac0

keystore/java/android/security/KeyStore2.java

+2 −3
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ package android.security; 


import android.annotation.NonNull;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.os.Build;

import android.compat.annotation.Disabled;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;
@@ -86,7 +85,7 @@ public class KeyStore2 { 
     * successfully conclude an operation.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.R)

    @Disabled // See b/180133780

    static final long KEYSTORE_OPERATION_CREATION_MAY_FAIL = 169897160L;



    // Never use mBinder directly, use KeyStore2.getService() instead or better yet