am cd108cbe: Merge "AID prefix registration." into lmp-dev (92dafc67) · Commits · e / os / android_frameworks_base

core/java/android/nfc/INfcCardEmulation.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,4 +36,5 @@ interface INfcCardEmulation
		List<ApduServiceInfo> getServices(int userHandle, in String category);
		boolean setPreferredService(in ComponentName service);
		boolean unsetPreferredService();
		boolean supportsAidPrefixRegistration();
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,20 @@ public final class ApduServiceInfo implements Parcelable {
		Log.e(TAG, "Ignoring invalid or duplicate aid: " + aid);
		}
		a.recycle();
		} else if (eventType == XmlPullParser.START_TAG &&
		"aid-prefix-filter".equals(tagName) && currentGroup != null) {
		final TypedArray a = res.obtainAttributes(attrs,
		com.android.internal.R.styleable.AidFilter);
		String aid = a.getString(com.android.internal.R.styleable.AidFilter_name).
		toUpperCase();
		// Add wildcard char to indicate prefix
		aid.concat("*");
		if (CardEmulation.isValidAid(aid) && !currentGroup.aids.contains(aid)) {
		currentGroup.aids.add(aid);
		} else {
		Log.e(TAG, "Ignoring invalid or duplicate aid: " + aid);
		}
		a.recycle();
		}
		}
		} catch (NameNotFoundException e) {

+15 −2

Original line number	Diff line number	Diff line
		@@ -515,9 +515,22 @@ public final class CardEmulation {
		* @return whether AID prefix registering is supported on this device.
		*/
		public boolean supportsAidPrefixRegistration() {
		// TODO
		try {
		return sService.supportsAidPrefixRegistration();
		} catch (RemoteException e) {
		recoverService();
		if (sService == null) {
		Log.e(TAG, "Failed to recover CardEmulationService.");
		return false;
		}
		try {
		return sService.supportsAidPrefixRegistration();
		} catch (RemoteException ee) {
		Log.e(TAG, "Failed to reach CardEmulationService.");
		return false;
		}
		}
		}

		/**
		* @hide

+1 −1

File changed.

Contains only whitespace changes.