diff options
| author | 2013-09-26 18:48:20 +0000 | |
|---|---|---|
| committer | 2013-09-26 18:48:20 +0000 | |
| commit | 1de64c0aa55f74f5b2692dcac3b3350dacda4041 (patch) | |
| tree | 40099c999b4535e6c298b8dca2cc8276ca0ed477 | |
| parent | ef2241563f8b15491fda198b49fe58e0ec316bfe (diff) | |
| parent | eed43391c682f64d2a0ec9a74d03b0e3d4d5a709 (diff) | |
Merge "Fix crash in ApduServiceInfo parsing." into klp-dev
| -rw-r--r-- | core/java/android/nfc/cardemulation/ApduServiceInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index d0feaa312e5e..d7ef4bc4e97f 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -159,7 +159,7 @@ public final class ApduServiceInfo implements Parcelable { com.android.internal.R.styleable.OffHostApduService_description); mRequiresDeviceUnlock = false; mBannerResourceId = sa.getResourceId( - com.android.internal.R.styleable.HostApduService_apduServiceBanner, -1); + com.android.internal.R.styleable.OffHostApduService_apduServiceBanner, -1); sa.recycle(); } |