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

Merge "TestAPI to skip user confirmation dialog when launching cross-profile intents" into udc-dev

Browse Source
This commit is contained in:
Liahav Eitan
2023-03-23 17:30:08 +00:00
committed by Android (Google) Code Review
parent 6bdeb7af89 df34033288
commit 725d9d5b23
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/app/IntentForwarderActivity.java
View File

@@ -16,14 +16,17 @@
package com.android.internal.app;
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_PERSONAL;
import static android.app.admin.DevicePolicyResources.Strings.Core.FORWARD_INTENT_TO_WORK;
import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static com.android.internal.app.ResolverActivity.EXTRA_CALLING_USER;
import static com.android.internal.app.ResolverActivity.EXTRA_SELECTED_PROFILE;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.AppGlobals;
@@ -79,6 +82,10 @@ public class IntentForwarderActivity extends Activity {
public static String FORWARD_INTENT_TO_MANAGED_PROFILE
= "com.android.internal.app.ForwardIntentToManagedProfile";
@TestApi
public static final String EXTRA_SKIP_USER_CONFIRMATION =
"com.android.internal.app.EXTRA_SKIP_USER_CONFIRMATION";
private static final Set<String> ALLOWED_TEXT_MESSAGE_SCHEMES
= new HashSet<>(Arrays.asList("sms", "smsto", "mms", "mmsto"));
@@ -181,6 +188,15 @@ public class IntentForwarderActivity extends Activity {
return;
}
if (launchIntent.getBooleanExtra(EXTRA_SKIP_USER_CONFIRMATION, /* defaultValue= */ false)
&& getCallingPackage() != null
&& PERMISSION_GRANTED == getPackageManager().checkPermission(
INTERACT_ACROSS_USERS, getCallingPackage())) {
startActivityAsCaller(launchIntent, targetUserId);
finish();
return;
}
int layoutId = R.layout.miniresolver;
setContentView(layoutId);