diff --git a/core/java/com/android/internal/app/BlockedAppActivity.java b/core/java/com/android/internal/app/BlockedAppActivity.java
index 65526eba3e54c..fbdbbfb06b780 100644
--- a/core/java/com/android/internal/app/BlockedAppActivity.java
+++ b/core/java/com/android/internal/app/BlockedAppActivity.java
@@ -17,7 +17,6 @@
package com.android.internal.app;
import android.content.Intent;
-import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -36,9 +35,6 @@ public class BlockedAppActivity extends AlertActivity {
private static final String TAG = "BlockedAppActivity";
private static final String PACKAGE_NAME = "com.android.internal.app";
private static final String EXTRA_BLOCKED_PACKAGE = PACKAGE_NAME + ".extra.BLOCKED_PACKAGE";
- private static final String EXTRA_BLOCKED_ACTIVITY_INFO =
- PACKAGE_NAME + ".extra.BLOCKED_ACTIVITY_INFO";
- private static final String EXTRA_STREAMED_DEVICE = PACKAGE_NAME + ".extra.STREAMED_DEVICE";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,30 +48,17 @@ public class BlockedAppActivity extends AlertActivity {
return;
}
- CharSequence appLabel = null;
String packageName = intent.getStringExtra(EXTRA_BLOCKED_PACKAGE);
- ActivityInfo activityInfo = intent.getParcelableExtra(EXTRA_BLOCKED_ACTIVITY_INFO);
- if (activityInfo != null) {
- appLabel = activityInfo.loadLabel(getPackageManager());
- } else if (!TextUtils.isEmpty(packageName)) {
- appLabel = getAppLabel(userId, packageName);
- }
-
- if (TextUtils.isEmpty(appLabel)) {
- Slog.wtf(TAG, "Invalid package: " + packageName + " or activity info: " + activityInfo);
+ if (TextUtils.isEmpty(packageName)) {
+ Slog.wtf(TAG, "Invalid package: " + packageName);
finish();
return;
}
- CharSequence streamedDeviceName = intent.getCharSequenceExtra(EXTRA_STREAMED_DEVICE);
- if (!TextUtils.isEmpty(streamedDeviceName)) {
- mAlertParams.mTitle = getString(R.string.app_streaming_blocked_title, appLabel);
- mAlertParams.mMessage =
- getString(R.string.app_streaming_blocked_message, streamedDeviceName);
- } else {
- mAlertParams.mTitle = getString(R.string.app_blocked_title);
- mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);
- }
+ CharSequence appLabel = getAppLabel(userId, packageName);
+
+ mAlertParams.mTitle = getString(R.string.app_blocked_title);
+ mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);
mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
setupAlert();
}
@@ -100,19 +83,4 @@ public class BlockedAppActivity extends AlertActivity {
.putExtra(Intent.EXTRA_USER_ID, userId)
.putExtra(EXTRA_BLOCKED_PACKAGE, packageName);
}
-
- /**
- * Creates an intent that launches {@link BlockedAppActivity} when app streaming is blocked.
- *
- * Using this method and providing a non-empty {@code streamedDeviceName} will cause the dialog
- * to use streaming-specific error messages.
- */
- public static Intent createStreamingBlockedIntent(int userId, ActivityInfo activityInfo,
- CharSequence streamedDeviceName) {
- return new Intent()
- .setClassName("android", BlockedAppActivity.class.getName())
- .putExtra(Intent.EXTRA_USER_ID, userId)
- .putExtra(EXTRA_BLOCKED_ACTIVITY_INFO, activityInfo)
- .putExtra(EXTRA_STREAMED_DEVICE, streamedDeviceName);
- }
}
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 0dbd4175b7167..d7ebb0f18c4b0 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -5439,15 +5439,6 @@
%1$s is not available right now.
-
- %1$s unavailable
-
- This can’t be accessed on your %1$s at this time. Try on your Android TV device instead.
-
- This can’t be accessed on your %1$s at this time. Try on your tablet instead.
-
- This can’t be accessed on your %1$s at this time. Try on your phone instead.
-
This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer.
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 764b2738bce88..33efbce15eea9 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3285,9 +3285,6 @@
-
-
-
diff --git a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
index bb49ba059d236..75acf81a4a3cc 100644
--- a/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
+++ b/services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java
@@ -39,7 +39,6 @@ import android.window.DisplayWindowPolicyController;
import java.util.List;
import java.util.Set;
-import java.util.function.Consumer;
/**
@@ -62,7 +61,6 @@ class GenericWindowPolicyController extends DisplayWindowPolicyController {
private final ArraySet mAllowedActivities;
@Nullable
private final ArraySet mBlockedActivities;
- private Consumer mActivityBlockedCallback;
@NonNull
final ArraySet mRunningUids = new ArraySet<>();
@@ -83,12 +81,10 @@ class GenericWindowPolicyController extends DisplayWindowPolicyController {
@NonNull ArraySet allowedUsers,
@Nullable Set allowedActivities,
@Nullable Set blockedActivities,
- @NonNull ActivityListener activityListener,
- @NonNull Consumer activityBlockedCallback) {
+ @NonNull ActivityListener activityListener) {
mAllowedUsers = allowedUsers;
mAllowedActivities = allowedActivities == null ? null : new ArraySet<>(allowedActivities);
mBlockedActivities = blockedActivities == null ? null : new ArraySet<>(blockedActivities);
- mActivityBlockedCallback = activityBlockedCallback;
setInterestedWindowFlags(windowFlags, systemWindowFlags);
mActivityListener = activityListener;
}
@@ -100,7 +96,6 @@ class GenericWindowPolicyController extends DisplayWindowPolicyController {
for (int i = 0; i < activityCount; i++) {
final ActivityInfo aInfo = activities.get(i);
if (!canContainActivity(aInfo, /* windowFlags= */ 0, /* systemWindowFlags= */ 0)) {
- mActivityBlockedCallback.accept(aInfo);
return false;
}
}
@@ -110,11 +105,7 @@ class GenericWindowPolicyController extends DisplayWindowPolicyController {
@Override
public boolean keepActivityOnWindowFlagsChanged(ActivityInfo activityInfo, int windowFlags,
int systemWindowFlags) {
- if (!canContainActivity(activityInfo, windowFlags, systemWindowFlags)) {
- mActivityBlockedCallback.accept(activityInfo);
- return false;
- }
- return true;
+ return canContainActivity(activityInfo, windowFlags, systemWindowFlags);
}
@Override
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
index 98a5ec1c3681b..95b9e58a9dfdd 100644
--- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
+++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
@@ -34,8 +34,6 @@ import android.companion.virtual.VirtualDeviceManager.ActivityListener;
import android.companion.virtual.VirtualDeviceParams;
import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
import android.graphics.Point;
import android.graphics.PointF;
import android.hardware.display.DisplayManager;
@@ -59,7 +57,6 @@ import android.util.SparseArray;
import android.window.DisplayWindowPolicyController;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.app.BlockedAppActivity;
import com.android.server.LocalServices;
import java.io.FileDescriptor;
@@ -421,8 +418,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
getAllowedUserHandles(),
mParams.getAllowedActivities(),
mParams.getBlockedActivities(),
- createListenerAdapter(displayId),
- activityInfo -> onActivityBlocked(displayId, activityInfo));
+ createListenerAdapter(displayId));
mWindowPolicyControllers.put(displayId, dwpc);
return dwpc;
}
@@ -445,16 +441,6 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
}
}
- private void onActivityBlocked(int displayId, ActivityInfo activityInfo) {
- Intent intent = BlockedAppActivity.createStreamingBlockedIntent(
- UserHandle.getUserId(activityInfo.applicationInfo.uid), activityInfo,
- mAssociationInfo.getDisplayName());
- mContext.startActivityAsUser(
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
- ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle(),
- mContext.getUser());
- }
-
private ArraySet getAllowedUserHandles() {
ArraySet result = new ArraySet<>();
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);