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

Commit 0d7aa31d authored by lpeter's avatar lpeter
Browse files

Rename the methods to easier understand what they do 

Because it is not clear to understand what these two methods do,
we rename them.
(1)updateVisibleActivitiesLocked()
(2)updateVisibleActivitiesChangedLocked

Bug: 235296082
Test: atest VoiceInteractionSessionVisibleActivityTest
Change-Id: Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f
parent af0f5507

core/java/android/service/voice/IVoiceInteractionSession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -40,5 +40,5 @@ oneway interface IVoiceInteractionSession { 
    void closeSystemDialogs();

    void onLockscreenShown();

    void destroy();

    void updateVisibleActivityInfo(in VisibleActivityInfo visibleActivityInfo, int type);

    void notifyVisibleActivityInfoChanged(in VisibleActivityInfo visibleActivityInfo, int type);

}

core/java/android/service/voice/VoiceInteractionSession.java

+14 −11
Original line number Diff line number Diff line
@@ -361,9 +361,10 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
        }



        @Override

        public void updateVisibleActivityInfo(VisibleActivityInfo visibleActivityInfo, int type) {

        public void notifyVisibleActivityInfoChanged(VisibleActivityInfo visibleActivityInfo,

                int type) {

            mHandlerCaller.sendMessage(

                    mHandlerCaller.obtainMessageIO(MSG_UPDATE_VISIBLE_ACTIVITY_INFO, type,

                    mHandlerCaller.obtainMessageIO(MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED, type,

                            visibleActivityInfo));

        }

    };
@@ -857,7 +858,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
    static final int MSG_SHOW = 106;

    static final int MSG_HIDE = 107;

    static final int MSG_ON_LOCKSCREEN_SHOWN = 108;

    static final int MSG_UPDATE_VISIBLE_ACTIVITY_INFO = 109;

    static final int MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED = 109;

    static final int MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK = 110;

    static final int MSG_UNREGISTER_VISIBLE_ACTIVITY_CALLBACK = 111;
@@ -945,12 +946,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
                    if (DEBUG) Log.d(TAG, "onLockscreenShown");

                    onLockscreenShown();

                    break;

                case MSG_UPDATE_VISIBLE_ACTIVITY_INFO:

                case MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED:

                    if (DEBUG) {

                        Log.d(TAG, "doUpdateVisibleActivityInfo: visibleActivityInfo=" + msg.obj

                        Log.d(TAG,

                                "doNotifyVisibleActivityInfoChanged: visibleActivityInfo=" + msg.obj

                                        + " type=" + msg.arg1);

                    }

                    doUpdateVisibleActivityInfo((VisibleActivityInfo) msg.obj, msg.arg1);

                    doNotifyVisibleActivityInfoChanged((VisibleActivityInfo) msg.obj, msg.arg1);

                    break;

                case MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK:

                    if (DEBUG) {
@@ -1178,7 +1180,8 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
        }

    }



    private void doUpdateVisibleActivityInfo(VisibleActivityInfo visibleActivityInfo, int type) {

    private void doNotifyVisibleActivityInfoChanged(VisibleActivityInfo visibleActivityInfo,

            int type) {



        if (mVisibleActivityCallbacks.isEmpty()) {

            return;
@@ -1186,11 +1189,11 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 


        switch (type) {

            case VisibleActivityInfo.TYPE_ACTIVITY_ADDED:

                informVisibleActivityChanged(visibleActivityInfo, type);

                notifyVisibleActivityChanged(visibleActivityInfo, type);

                mVisibleActivityInfos.add(visibleActivityInfo);

                break;

            case VisibleActivityInfo.TYPE_ACTIVITY_REMOVED:

                informVisibleActivityChanged(visibleActivityInfo, type);

                notifyVisibleActivityChanged(visibleActivityInfo, type);

                mVisibleActivityInfos.remove(visibleActivityInfo);

                break;

        }
@@ -1235,7 +1238,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
        }

    }



    private void informVisibleActivityChanged(VisibleActivityInfo visibleActivityInfo, int type) {

    private void notifyVisibleActivityChanged(VisibleActivityInfo visibleActivityInfo, int type) {

        for (Map.Entry<VisibleActivityCallback, Executor> e :

                mVisibleActivityCallbacks.entrySet()) {

            final Executor executor = e.getValue();

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

+14 −14
Original line number Diff line number Diff line
@@ -618,10 +618,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 


        mScheduledExecutorService.execute(() -> {

            if (DEBUG) {

                Slog.d(TAG, "call updateVisibleActivitiesLocked from enable listening");

                Slog.d(TAG, "call handleVisibleActivitiesLocked from enable listening");

            }

            synchronized (mLock) {

                updateVisibleActivitiesLocked();

                handleVisibleActivitiesLocked();

            }

        });

    }
@@ -646,10 +646,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        }

        mScheduledExecutorService.execute(() -> {

            if (DEBUG) {

                Slog.d(TAG, "call updateVisibleActivitiesLocked from activity event");

                Slog.d(TAG, "call handleVisibleActivitiesLocked from activity event");

            }

            synchronized (mLock) {

                updateVisibleActivitiesLocked();

                handleVisibleActivitiesLocked();

            }

        });

    }
@@ -684,9 +684,9 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        return visibleActivityInfos;

    }



    private void updateVisibleActivitiesLocked() {

    private void handleVisibleActivitiesLocked() {

        if (DEBUG) {

            Slog.d(TAG, "updateVisibleActivitiesLocked");

            Slog.d(TAG, "handleVisibleActivitiesLocked");

        }

        if (mSession == null) {

            return;
@@ -697,13 +697,13 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        final List<VisibleActivityInfo> newVisibleActivityInfos = getVisibleActivityInfosLocked();



        if (newVisibleActivityInfos == null || newVisibleActivityInfos.isEmpty()) {

            updateVisibleActivitiesChangedLocked(mVisibleActivityInfos,

            notifyVisibleActivitiesChangedLocked(mVisibleActivityInfos,

                    VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);

            mVisibleActivityInfos.clear();

            return;

        }

        if (mVisibleActivityInfos.isEmpty()) {

            updateVisibleActivitiesChangedLocked(newVisibleActivityInfos,

            notifyVisibleActivitiesChangedLocked(newVisibleActivityInfos,

                    VisibleActivityInfo.TYPE_ACTIVITY_ADDED);

            mVisibleActivityInfos.addAll(newVisibleActivityInfos);

            return;
@@ -724,11 +724,11 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        }



        if (!addedActivities.isEmpty()) {

            updateVisibleActivitiesChangedLocked(addedActivities,

            notifyVisibleActivitiesChangedLocked(addedActivities,

                    VisibleActivityInfo.TYPE_ACTIVITY_ADDED);

        }

        if (!removedActivities.isEmpty()) {

            updateVisibleActivitiesChangedLocked(removedActivities,

            notifyVisibleActivitiesChangedLocked(removedActivities,

                    VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);

        }
@@ -736,7 +736,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        mVisibleActivityInfos.addAll(newVisibleActivityInfos);

    }



    private void updateVisibleActivitiesChangedLocked(

    private void notifyVisibleActivitiesChangedLocked(

            List<VisibleActivityInfo> visibleActivityInfos, int type) {

        if (visibleActivityInfos == null || visibleActivityInfos.isEmpty()) {

            return;
@@ -746,15 +746,15 @@ final class VoiceInteractionSessionConnection implements ServiceConnection, 
        }

        try {

            for (int i = 0; i < visibleActivityInfos.size(); i++) {

                mSession.updateVisibleActivityInfo(visibleActivityInfos.get(i), type);

                mSession.notifyVisibleActivityInfoChanged(visibleActivityInfos.get(i), type);

            }

        } catch (RemoteException e) {

            if (DEBUG) {

                Slog.w(TAG, "updateVisibleActivitiesChangedLocked RemoteException : " + e);

                Slog.w(TAG, "notifyVisibleActivitiesChangedLocked RemoteException : " + e);

            }

        }

        if (DEBUG) {

            Slog.d(TAG, "updateVisibleActivitiesChangedLocked type=" + type + ", count="

            Slog.d(TAG, "notifyVisibleActivitiesChangedLocked type=" + type + ", count="

                    + visibleActivityInfos.size());

        }

    }