Merge "Add null checking to fix NullPointerException while creating mock tag" (09345026) · Commits · e / os / android_frameworks_base

core/java/android/nfc/Tag.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -142,9 +142,13 @@ public final class Tag implements Parcelable {
		mTagService = tagService;

		mConnectedTechnology = -1;
		mCookie = SystemClock.elapsedRealtime();

		if (tagService == null) {
		return;
		}

		try {
		mCookie = SystemClock.elapsedRealtime();
		tagService.setTagUpToDate(mCookie);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		@@ -370,6 +374,10 @@ public final class Tag implements Parcelable {
		/** @hide */
		@UnsupportedAppUsage
		public INfcTag getTagService() {
		if (mTagService == null) {
		return null;
		}

		try {
		if (!mTagService.isTagUpToDate(mCookie)) {
		String id_str = "";