Remove VoiceInteractionService whitelisting
Previously, the VoiceInteractionService was started directly
from the ActivityManagerService by temporarily whitelisting its
package.
In this CL, we start it via the VoiceInteractionManagerService.
This takes care to keep the connection to the Assistant alive
(or start it if necessary). This way, whitelisting is no longer needed.
Bug: 119424643
Test: adb shell am force-stop com.google.android.katniss && \
adb shell input keyevent 219
And check that operation terminates successfully and Assistant is
launched.
Change-Id: I3d44eec5f4f33d33478736c59f0c1ef7a2605979
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index f76d0eb..cf4f0a6 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -246,7 +246,6 @@
import com.android.internal.util.Preconditions;
import com.android.internal.util.function.pooled.PooledLambda;
import com.android.server.AttributeCache;
-import com.android.server.DeviceIdleController;
import com.android.server.LocalServices;
import com.android.server.SystemService;
import com.android.server.SystemServiceManager;
@@ -434,9 +433,6 @@
private static final long START_AS_CALLER_TOKEN_EXPIRED_TIMEOUT =
START_AS_CALLER_TOKEN_TIMEOUT_IMPL + 20 * MINUTE_IN_MILLIS;
- // How long to whitelist the Services for when requested.
- private static final int SERVICE_LAUNCH_IDLE_WHITELIST_DURATION_MS = 5 * 1000;
-
// Activity tokens of system activities that are delegating their call to
// #startActivityByCaller, keyed by the permissionToken granted to the delegate.
final HashMap<IBinder, IBinder> mStartActivitySources = new HashMap<>();
@@ -3079,9 +3075,9 @@
try {
if (TextUtils.equals(pae.intent.getAction(),
android.service.voice.VoiceInteractionService.SERVICE_INTERFACE)) {
- pae.intent.putExtras(pae.extras);
-
- startVoiceInteractionServiceAsUser(pae.intent, pae.userHandle, "AssistContext");
+ // Start voice interaction through VoiceInteractionManagerService.
+ mAssistUtils.showSessionForActiveService(sendBundle, SHOW_SOURCE_APPLICATION,
+ null, null);
} else {
pae.intent.replaceExtras(pae.extras);
pae.intent.setFlags(FLAG_ACTIVITY_NEW_TASK
@@ -3100,34 +3096,6 @@
}
}
- /**
- * Workaround for historical API which starts the Assist service with a non-foreground
- * {@code startService()} call.
- */
- private void startVoiceInteractionServiceAsUser(
- Intent intent, int userHandle, String reason) {
- // Resolve the intent to find out which package we need to whitelist.
- ResolveInfo resolveInfo =
- mContext.getPackageManager().resolveServiceAsUser(intent, 0, userHandle);
- if (resolveInfo == null || resolveInfo.serviceInfo == null) {
- Slog.e(TAG, "VoiceInteractionService intent does not resolve. Not starting.");
- return;
- }
- intent.setPackage(resolveInfo.serviceInfo.packageName);
-
- // Whitelist background services temporarily.
- LocalServices.getService(DeviceIdleController.LocalService.class)
- .addPowerSaveTempWhitelistApp(Process.myUid(), intent.getPackage(),
- SERVICE_LAUNCH_IDLE_WHITELIST_DURATION_MS, userHandle, false, reason);
-
- // Finally, try to start the service.
- try {
- mContext.startServiceAsUser(intent, UserHandle.of(userHandle));
- } catch (RuntimeException e) {
- Slog.e(TAG, "VoiceInteractionService failed to start.", e);
- }
- }
-
@Override
public int addAppTask(IBinder activityToken, Intent intent,
ActivityManager.TaskDescription description, Bitmap thumbnail) throws RemoteException {