Merge "don't log non-instant app resolutions" into oc-dev (f2e4e8ba) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/InstantAppResolver.java

+5 −9

Original line number	Original line	Diff line number	Diff line
	@@ -86,22 +86,18 @@ public abstract class InstantAppResolver {
	final List<InstantAppResolveInfo> instantAppResolveInfoList =		final List<InstantAppResolveInfo> instantAppResolveInfoList =
	connection.getInstantAppResolveInfoList(shaPrefix, token);		connection.getInstantAppResolveInfoList(shaPrefix, token);

	final AuxiliaryResolveInfo resolveInfo;
	if (instantAppResolveInfoList == null \|\| instantAppResolveInfoList.size() == 0) {		if (instantAppResolveInfoList == null \|\| instantAppResolveInfoList.size() == 0) {
	// No hash prefix match; there are no instant apps for this domain.		// No hash prefix match; there are no instant apps for this domain.
	if (DEBUG_EPHEMERAL) {		if (DEBUG_EPHEMERAL) {
	Log.d(TAG, "No results returned");		Log.d(TAG, "No results returned");
	}		}
	resolveInfo = null;		return null;
	} else {
	resolveInfo = InstantAppResolver.filterInstantAppIntent(instantAppResolveInfoList,
	intent, requestObj.resolvedType, requestObj.userId,
	intent.getPackage(), digest, token);
	}		}
			final AuxiliaryResolveInfo resolveInfo = InstantAppResolver.filterInstantAppIntent(
			instantAppResolveInfoList, intent, requestObj.resolvedType, requestObj.userId,
			intent.getPackage(), digest, token);
	logMetrics(ACTION_INSTANT_APP_RESOLUTION_PHASE_ONE, startTime, token,		logMetrics(ACTION_INSTANT_APP_RESOLUTION_PHASE_ONE, startTime, token,
	resolveInfo != null ? RESOLUTION_SUCCESS : RESOLUTION_FAILURE);		RESOLUTION_SUCCESS);

	return resolveInfo;		return resolveInfo;
	}		}