Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add @NonNull annotations to (un)setOffHostForService()"

Browse Source 
am: 78366e46b2

Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3
This commit is contained in:
Ruchi Kandoi
2019-03-08 06:03:45 -08:00
committed by android-build-merger
parent f63b6157a1 78366e46b2
commit 049cd3b67e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -29194,10 +29194,10 @@ package android.nfc.cardemulation {
method public boolean isDefaultServiceForCategory(android.content.ComponentName, String);
method public boolean registerAidsForService(android.content.ComponentName, String, java.util.List<java.lang.String>);
method public boolean removeAidsForService(android.content.ComponentName, String);
method public boolean setOffHostForService(android.content.ComponentName, String);
method public boolean setOffHostForService(@NonNull android.content.ComponentName, @NonNull String);
method public boolean setPreferredService(android.app.Activity, android.content.ComponentName);
method public boolean supportsAidPrefixRegistration();
method public boolean unsetOffHostForService(android.content.ComponentName);
method public boolean unsetOffHostForService(@NonNull android.content.ComponentName);
method public boolean unsetPreferredService(android.app.Activity);
field public static final String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";
field public static final String CATEGORY_OTHER = "other";

6
core/java/android/nfc/cardemulation/CardEmulation.java
View File

@@ -16,6 +16,7 @@
package android.nfc.cardemulation;
import android.annotation.NonNull;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.Activity;
@@ -359,7 +360,7 @@ public final class CardEmulation {
* @param service The component name of the service
* @return whether the registration was successful.
*/
public boolean unsetOffHostForService(ComponentName service) {
public boolean unsetOffHostForService(@NonNull ComponentName service) {
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mContext);
if (adapter == null) {
return false;
@@ -405,7 +406,8 @@ public final class CardEmulation {
* @param offHostSecureElement Secure Element to register the AID to
* @return whether the registration was successful.
*/
public boolean setOffHostForService(ComponentName service, String offHostSecureElement) {
public boolean setOffHostForService(@NonNull ComponentName service,
@NonNull String offHostSecureElement) {
boolean validSecureElement = false;
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mContext);