Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1987db0f authored by Shashwat Razdan's avatar Shashwat Razdan Committed by Automerger Merge Worker
Browse files

Merge "Removing logspam from SmartspaceService" into sc-dev am: 96b300db 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14794073

Change-Id: I7996a1cd2b9679ea67dc8f365eb9ffbc44de847a
parents a17cdbab 96b300db

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

+21 −7
Original line number Diff line number Diff line
@@ -122,14 +122,18 @@ public abstract class SmartspaceService extends Service { 
    @Override

    public void onCreate() {

        super.onCreate();

        if (DEBUG) {

            Log.d(TAG, "onCreate mSessionCallbacks: " + mSessionCallbacks);

        }

        mHandler = new Handler(Looper.getMainLooper(), null, true);

    }



    @Override

    @NonNull

    public final IBinder onBind(@NonNull Intent intent) {

        if (DEBUG) {

            Log.d(TAG, "onBind mSessionCallbacks: " + mSessionCallbacks);

        }

        if (SERVICE_INTERFACE.equals(intent.getAction())) {

            return mInterface.asBinder();

        }
@@ -140,7 +144,9 @@ public abstract class SmartspaceService extends Service { 


    private void doCreateSmartspaceSession(@NonNull SmartspaceConfig config,

            @NonNull SmartspaceSessionId sessionId) {

        if (DEBUG) {

            Log.d(TAG, "doCreateSmartspaceSession mSessionCallbacks: " + mSessionCallbacks);

        }

        mSessionCallbacks.put(sessionId, new ArrayList<>());

        onCreateSmartspaceSession(config, sessionId);

    }
@@ -166,7 +172,9 @@ public abstract class SmartspaceService extends Service { 


    private void doRegisterSmartspaceUpdates(@NonNull SmartspaceSessionId sessionId,

            @NonNull ISmartspaceCallback callback) {

        if (DEBUG) {

            Log.d(TAG, "doRegisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);

        }

        final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);

        if (callbacks == null) {

            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,

            @NonNull ISmartspaceCallback callback) {

        if (DEBUG) {

            Log.d(TAG, "doUnregisterSmartspaceUpdates mSessionCallbacks: " + mSessionCallbacks);

        }

        final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);

        if (callbacks == null) {

            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) {

        if (DEBUG) {

            Log.d(TAG, "doRequestPredictionUpdate mSessionCallbacks: " + mSessionCallbacks);

        }

        // Just an optimization, if there are no callbacks, then don't bother notifying the service

        final ArrayList<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);

        if (callbacks != null && !callbacks.isEmpty()) {
@@ -246,7 +258,9 @@ public abstract class SmartspaceService extends Service { 
     */

    public final void updateSmartspaceTargets(@NonNull SmartspaceSessionId sessionId,

            @NonNull List<SmartspaceTarget> targets) {

        if (DEBUG) {

            Log.d(TAG, "updateSmartspaceTargets mSessionCallbacks: " + mSessionCallbacks);

        }

        List<CallbackWrapper> callbacks = mSessionCallbacks.get(sessionId);

        if (callbacks != null) {

            for (CallbackWrapper callback : callbacks) {