Merge "Rename the methods to easier understand what they do" into tm-qpr-dev am: 0b673f9ea6 (8378cdbd) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,5 +40,5 @@ oneway interface IVoiceInteractionSession {
	void closeSystemDialogs();		void closeSystemDialogs();
	void onLockscreenShown();		void onLockscreenShown();
	void destroy();		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	Original line	Diff line number	Diff line
	@@ -359,9 +359,10 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
	}		}

	@Override		@Override
	public void updateVisibleActivityInfo(VisibleActivityInfo visibleActivityInfo, int type) {		public void notifyVisibleActivityInfoChanged(VisibleActivityInfo visibleActivityInfo,
			int type) {
	mHandlerCaller.sendMessage(		mHandlerCaller.sendMessage(
	mHandlerCaller.obtainMessageIO(MSG_UPDATE_VISIBLE_ACTIVITY_INFO, type,		mHandlerCaller.obtainMessageIO(MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED, type,
	visibleActivityInfo));		visibleActivityInfo));
	}		}
	};		};
	@@ -855,7 +856,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
	static final int MSG_SHOW = 106;		static final int MSG_SHOW = 106;
	static final int MSG_HIDE = 107;		static final int MSG_HIDE = 107;
	static final int MSG_ON_LOCKSCREEN_SHOWN = 108;		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_REGISTER_VISIBLE_ACTIVITY_CALLBACK = 110;
	static final int MSG_UNREGISTER_VISIBLE_ACTIVITY_CALLBACK = 111;		static final int MSG_UNREGISTER_VISIBLE_ACTIVITY_CALLBACK = 111;

	@@ -943,12 +944,13 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
	if (DEBUG) Log.d(TAG, "onLockscreenShown");		if (DEBUG) Log.d(TAG, "onLockscreenShown");
	onLockscreenShown();		onLockscreenShown();
	break;		break;
	case MSG_UPDATE_VISIBLE_ACTIVITY_INFO:		case MSG_NOTIFY_VISIBLE_ACTIVITY_INFO_CHANGED:
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG, "doUpdateVisibleActivityInfo: visibleActivityInfo=" + msg.obj		Log.d(TAG,
			"doNotifyVisibleActivityInfoChanged: visibleActivityInfo=" + msg.obj
	+ " type=" + msg.arg1);		+ " type=" + msg.arg1);
	}		}
	doUpdateVisibleActivityInfo((VisibleActivityInfo) msg.obj, msg.arg1);		doNotifyVisibleActivityInfoChanged((VisibleActivityInfo) msg.obj, msg.arg1);
	break;		break;
	case MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK:		case MSG_REGISTER_VISIBLE_ACTIVITY_CALLBACK:
	if (DEBUG) {		if (DEBUG) {
	@@ -1158,7 +1160,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()) {		if (mVisibleActivityCallbacks.isEmpty()) {
	return;		return;
	@@ -1166,11 +1169,11 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall

	switch (type) {		switch (type) {
	case VisibleActivityInfo.TYPE_ACTIVITY_ADDED:		case VisibleActivityInfo.TYPE_ACTIVITY_ADDED:
	informVisibleActivityChanged(visibleActivityInfo, type);		notifyVisibleActivityChanged(visibleActivityInfo, type);
	mVisibleActivityInfos.add(visibleActivityInfo);		mVisibleActivityInfos.add(visibleActivityInfo);
	break;		break;
	case VisibleActivityInfo.TYPE_ACTIVITY_REMOVED:		case VisibleActivityInfo.TYPE_ACTIVITY_REMOVED:
	informVisibleActivityChanged(visibleActivityInfo, type);		notifyVisibleActivityChanged(visibleActivityInfo, type);
	mVisibleActivityInfos.remove(visibleActivityInfo);		mVisibleActivityInfos.remove(visibleActivityInfo);
	break;		break;
	}		}
	@@ -1215,7 +1218,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 :		for (Map.Entry<VisibleActivityCallback, Executor> e :
	mVisibleActivityCallbacks.entrySet()) {		mVisibleActivityCallbacks.entrySet()) {
	final Executor executor = e.getValue();		final Executor executor = e.getValue();

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

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -613,10 +613,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,

	mScheduledExecutorService.execute(() -> {		mScheduledExecutorService.execute(() -> {
	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "call updateVisibleActivitiesLocked from enable listening");		Slog.d(TAG, "call handleVisibleActivitiesLocked from enable listening");
	}		}
	synchronized (mLock) {		synchronized (mLock) {
	updateVisibleActivitiesLocked();		handleVisibleActivitiesLocked();
	}		}
	});		});
	}		}
	@@ -641,10 +641,10 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,
	}		}
	mScheduledExecutorService.execute(() -> {		mScheduledExecutorService.execute(() -> {
	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "call updateVisibleActivitiesLocked from activity event");		Slog.d(TAG, "call handleVisibleActivitiesLocked from activity event");
	}		}
	synchronized (mLock) {		synchronized (mLock) {
	updateVisibleActivitiesLocked();		handleVisibleActivitiesLocked();
	}		}
	});		});
	}		}
	@@ -679,9 +679,9 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,
	return visibleActivityInfos;		return visibleActivityInfos;
	}		}

	private void updateVisibleActivitiesLocked() {		private void handleVisibleActivitiesLocked() {
	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "updateVisibleActivitiesLocked");		Slog.d(TAG, "handleVisibleActivitiesLocked");
	}		}
	if (mSession == null) {		if (mSession == null) {
	return;		return;
	@@ -692,13 +692,13 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,
	final List<VisibleActivityInfo> newVisibleActivityInfos = getVisibleActivityInfosLocked();		final List<VisibleActivityInfo> newVisibleActivityInfos = getVisibleActivityInfosLocked();

	if (newVisibleActivityInfos == null \|\| newVisibleActivityInfos.isEmpty()) {		if (newVisibleActivityInfos == null \|\| newVisibleActivityInfos.isEmpty()) {
	updateVisibleActivitiesChangedLocked(mVisibleActivityInfos,		notifyVisibleActivitiesChangedLocked(mVisibleActivityInfos,
	VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);		VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);
	mVisibleActivityInfos.clear();		mVisibleActivityInfos.clear();
	return;		return;
	}		}
	if (mVisibleActivityInfos.isEmpty()) {		if (mVisibleActivityInfos.isEmpty()) {
	updateVisibleActivitiesChangedLocked(newVisibleActivityInfos,		notifyVisibleActivitiesChangedLocked(newVisibleActivityInfos,
	VisibleActivityInfo.TYPE_ACTIVITY_ADDED);		VisibleActivityInfo.TYPE_ACTIVITY_ADDED);
	mVisibleActivityInfos.addAll(newVisibleActivityInfos);		mVisibleActivityInfos.addAll(newVisibleActivityInfos);
	return;		return;
	@@ -719,11 +719,11 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,
	}		}

	if (!addedActivities.isEmpty()) {		if (!addedActivities.isEmpty()) {
	updateVisibleActivitiesChangedLocked(addedActivities,		notifyVisibleActivitiesChangedLocked(addedActivities,
	VisibleActivityInfo.TYPE_ACTIVITY_ADDED);		VisibleActivityInfo.TYPE_ACTIVITY_ADDED);
	}		}
	if (!removedActivities.isEmpty()) {		if (!removedActivities.isEmpty()) {
	updateVisibleActivitiesChangedLocked(removedActivities,		notifyVisibleActivitiesChangedLocked(removedActivities,
	VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);		VisibleActivityInfo.TYPE_ACTIVITY_REMOVED);
	}		}

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

	private void updateVisibleActivitiesChangedLocked(		private void notifyVisibleActivitiesChangedLocked(
	List<VisibleActivityInfo> visibleActivityInfos, int type) {		List<VisibleActivityInfo> visibleActivityInfos, int type) {
	if (visibleActivityInfos == null \|\| visibleActivityInfos.isEmpty()) {		if (visibleActivityInfos == null \|\| visibleActivityInfos.isEmpty()) {
	return;		return;
	@@ -741,15 +741,15 @@ final class VoiceInteractionSessionConnection implements ServiceConnection,
	}		}
	try {		try {
	for (int i = 0; i < visibleActivityInfos.size(); i++) {		for (int i = 0; i < visibleActivityInfos.size(); i++) {
	mSession.updateVisibleActivityInfo(visibleActivityInfos.get(i), type);		mSession.notifyVisibleActivityInfoChanged(visibleActivityInfos.get(i), type);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	if (DEBUG) {		if (DEBUG) {
	Slog.w(TAG, "updateVisibleActivitiesChangedLocked RemoteException : " + e);		Slog.w(TAG, "notifyVisibleActivitiesChangedLocked RemoteException : " + e);
	}		}
	}		}
	if (DEBUG) {		if (DEBUG) {
	Slog.d(TAG, "updateVisibleActivitiesChangedLocked type=" + type + ", count="		Slog.d(TAG, "notifyVisibleActivitiesChangedLocked type=" + type + ", count="
	+ visibleActivityInfos.size());		+ visibleActivityInfos.size());
	}		}
	}		}