Annotate KeyStore service as never null

Bug: 245258360
Change-Id: I4d9215486df275012dad495730ce0ff00839b7a6
Test: TH
This commit is contained in:
Tomasz Wasilczyk
2022-09-23 21:42:58 +00:00
parent f9d8bb250a
commit 5ead731c57

View File

@@ -32,6 +32,7 @@ import android.system.keystore2.ResponseCode;
import android.util.Log;
import java.util.Calendar;
import java.util.Objects;
/**
* @hide This should not be made public in its present form because it
@@ -137,13 +138,13 @@ public class KeyStore2 {
return new KeyStore2();
}
private synchronized IKeystoreService getService(boolean retryLookup) {
@NonNull private synchronized IKeystoreService getService(boolean retryLookup) {
if (mBinder == null || retryLookup) {
mBinder = IKeystoreService.Stub.asInterface(ServiceManager
.getService(KEYSTORE2_SERVICE_NAME));
Binder.allowBlocking(mBinder.asBinder());
}
return mBinder;
return Objects.requireNonNull(mBinder);
}
void delete(KeyDescriptor descriptor) throws KeyStoreException {