Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the methods to easier understand what they do

Browse Source 
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
(cherry picked from commit 0d7aa31d35)
Merged-In: Id7db3a0dc9c2a17276ae213223fa3dd6ae572b9f
This commit is contained in:
lpeter
2022-09-01 08:07:41 +00:00
committed by Peter Li
parent fe8b17d49d
commit cfc66c9342
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/voice/IVoiceInteractionSession.aidl
View File

@@ -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);
}

25
core/java/android/service/voice/VoiceInteractionSession.java
View File

@@ -358,9 +358,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));
}
};
@@ -854,7 +855,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;
@@ -942,12 +943,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
+ " type=" + msg.arg1);
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) {
@@ -1157,7 +1159,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;
@@ -1165,11 +1168,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;
}
@@ -1214,7 +1217,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();

28
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
View File

@@ -613,10 +613,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();
}
});
}
@@ -641,10 +641,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();
}
});
}
@@ -679,9 +679,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;
@@ -692,13 +692,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;
@@ -719,11 +719,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);
}
@@ -731,7 +731,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;
@@ -741,15 +741,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());
}
}