Merge "Removing logspam from SmartspaceService" into sc-dev (96b300db) · Commits · e / os / android_frameworks_base

core/java/android/service/smartspace/SmartspaceService.java

+21 −7

Original line number	Original line	Diff line number	Diff line
	@@ -122,14 +122,18 @@ public abstract class SmartspaceService extends Service {
	@Override		@Override
	public void onCreate() {		public void onCreate() {
	super.onCreate();		super.onCreate();
			if (DEBUG) {
	Log.d(TAG, "onCreate mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "onCreate mSessionCallbacks: " + mSessionCallbacks);
			}
	mHandler = new Handler(Looper.getMainLooper(), null, true);		mHandler = new Handler(Looper.getMainLooper(), null, true);
	}		}

	@Override		@Override
	@NonNull		@NonNull
	public final IBinder onBind(@NonNull Intent intent) {		public final IBinder onBind(@NonNull Intent intent) {
			if (DEBUG) {
	Log.d(TAG, "onBind mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "onBind mSessionCallbacks: " + mSessionCallbacks);
			}
	if (SERVICE_INTERFACE.equals(intent.getAction())) {		if (SERVICE_INTERFACE.equals(intent.getAction())) {
	return mInterface.asBinder();		return mInterface.asBinder();
	}		}
	@@ -140,7 +144,9 @@ public abstract class SmartspaceService extends Service {

	private void doCreateSmartspaceSession(@NonNull SmartspaceConfig config,		private void doCreateSmartspaceSession(@NonNull SmartspaceConfig config,
	@NonNull SmartspaceSessionId sessionId) {		@NonNull SmartspaceSessionId sessionId) {
			if (DEBUG) {
	Log.d(TAG, "doCreateSmartspaceSession mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "doCreateSmartspaceSession mSessionCallbacks: " + mSessionCallbacks);
			}
	mSessionCallbacks.put(sessionId, new ArrayList<>());		mSessionCallbacks.put(sessionId, new ArrayList<>());
	onCreateSmartspaceSession(config, sessionId);		onCreateSmartspaceSession(config, sessionId);
	}		}
	@@ -166,7 +172,9 @@ public abstract class SmartspaceService extends Service {

	private void doRegisterSmartspaceUpdates(@NonNull SmartspaceSessionId sessionId,		private void doRegisterSmartspaceUpdates(@NonNull SmartspaceSessionId sessionId,
	@NonNull ISmartspaceCallback callback) {		@NonNull ISmartspaceCallback callback) {
			if (DEBUG) {
	Log.d(TAG, "doRegisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "doRegisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);
			}
	final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);		final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);
	if (callbacks == null) {		if (callbacks == null) {
	Slog.e(TAG, "Failed to register for updates for unknown session: " + sessionId);		Slog.e(TAG, "Failed to register for updates for unknown session: " + sessionId);
	@@ -184,7 +192,9 @@ public abstract class SmartspaceService extends Service {

	private void doUnregisterSmartspaceUpdates(@NonNull SmartspaceSessionId sessionId,		private void doUnregisterSmartspaceUpdates(@NonNull SmartspaceSessionId sessionId,
	@NonNull ISmartspaceCallback callback) {		@NonNull ISmartspaceCallback callback) {
			if (DEBUG) {
	Log.d(TAG, "doUnregisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "doUnregisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);
			}
	final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);		final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);
	if (callbacks == null) {		if (callbacks == null) {
	Slog.e(TAG, "Failed to unregister for updates for unknown session: " + sessionId);		Slog.e(TAG, "Failed to unregister for updates for unknown session: " + sessionId);
	@@ -198,7 +208,9 @@ public abstract class SmartspaceService extends Service {
	}		}

	private void doRequestPredictionUpdate(@NonNull SmartspaceSessionId sessionId) {		private void doRequestPredictionUpdate(@NonNull SmartspaceSessionId sessionId) {
			if (DEBUG) {
	Log.d(TAG, "doRequestPredictionUpdate mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "doRequestPredictionUpdate mSessionCallbacks: " + mSessionCallbacks);
			}
	// Just an optimization, if there are no callbacks, then don't bother notifying the service		// Just an optimization, if there are no callbacks, then don't bother notifying the service
	final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);		final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);
	if (callbacks != null && !callbacks.isEmpty()) {		if (callbacks != null && !callbacks.isEmpty()) {
	@@ -246,7 +258,9 @@ public abstract class SmartspaceService extends Service {
	*/		*/
	public final void updateSmartspaceTargets(@NonNull SmartspaceSessionId sessionId,		public final void updateSmartspaceTargets(@NonNull SmartspaceSessionId sessionId,
	@NonNull List<SmartspaceTarget> targets) {		@NonNull List<SmartspaceTarget> targets) {
			if (DEBUG) {
	Log.d(TAG, "updateSmartspaceTargets mSessionCallbacks: " + mSessionCallbacks);		Log.d(TAG, "updateSmartspaceTargets mSessionCallbacks: " + mSessionCallbacks);
			}
	List<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);		List<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);
	if (callbacks != null) {		if (callbacks != null) {
	for (CallbackWrapper callback : callbacks) {		for (CallbackWrapper callback : callbacks) {