Merge "Modifies logs on findNanoAppOnHub" (153daa89) · Commits · e / os / android_frameworks_base

core/java/android/hardware/location/NanoAppFilter.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ package android.hardware.location;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Log;

		/**
		* @hide
		@@ -130,6 +129,14 @@ public class NanoAppFilter {
		(versionsMatch(mVersionRestrictionMask, mAppVersion, info.getAppVersion()));
		}

		@Override
		public String toString() {
		return "nanoAppId: 0x" + Long.toHexString(mAppId)
		+ ", nanoAppVersion: 0x" + Integer.toHexString(mAppVersion)
		+ ", versionMask: " + mVersionRestrictionMask
		+ ", vendorMask: " + mAppIdVendorMask;
		}

		public static final Parcelable.Creator<NanoAppFilter> CREATOR
		= new Parcelable.Creator<NanoAppFilter>() {
		public NanoAppFilter createFromParcel(Parcel in) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -479,7 +479,11 @@ public class ContextHubService extends IContextHubService.Stub {
		retArray[i] = foundInstances.get(i).intValue();
		}

		Log.w(TAG, "Found " + retArray.length + " apps on hub handle " + hubHandle);
		if (retArray.length == 0) {
		Log.d(TAG, "No nanoapps found on hub ID " + hubHandle + " using NanoAppFilter: "
		+ filter);
		}

		return retArray;
		}