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

Merge "Pass EXTRA_CALLING_PACKAGE for legacy change default dialer/SMS intents." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-12 23:02:47 +00:00
committed by Android (Google) Code Review
parent 1feb0dfde8 560aa5798f
commit 0cdc7e9b98
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -798,7 +798,7 @@ public final class PermissionPolicyService extends SystemService {
@Override @Override
public boolean checkStartActivity(@NonNull Intent intent, int callingUid, public boolean checkStartActivity(@NonNull Intent intent, int callingUid,
@Nullable String callingPackage) { @Nullable String callingPackage) {
if (callingPackage != null && isActionRemovedForCallingPackage(intent.getAction(), if (callingPackage != null && isActionRemovedForCallingPackage(intent, callingUid,
callingPackage)) { callingPackage)) {
Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from " Slog.w(LOG_TAG, "Action Removed: starting " + intent.toString() + " from "
+ callingPackage + " (uid=" + callingUid + ")"); + callingPackage + " (uid=" + callingUid + ")");
@@ -811,8 +811,9 @@ public final class PermissionPolicyService extends SystemService {
* Check if the intent action is removed for the calling package (often based on target SDK * Check if the intent action is removed for the calling package (often based on target SDK
* version). If the action is removed, we'll silently cancel the activity launch. * version). If the action is removed, we'll silently cancel the activity launch.
*/ */
private boolean isActionRemovedForCallingPackage(@Nullable String action, private boolean isActionRemovedForCallingPackage(@NonNull Intent intent, int callingUid,
@NonNull String callingPackage) { @NonNull String callingPackage) {
String action = intent.getAction();
if (action == null) { if (action == null) {
return false; return false;
} }
@@ -821,15 +822,19 @@ public final class PermissionPolicyService extends SystemService {
case Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT: { case Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT: {
ApplicationInfo applicationInfo; ApplicationInfo applicationInfo;
try { try {
applicationInfo = getContext().getPackageManager().getApplicationInfo( applicationInfo = getContext().getPackageManager().getApplicationInfoAsUser(
callingPackage, 0); callingPackage, 0, UserHandle.getUserId(callingUid));
if (applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q) {
// Applications targeting Q or higher should use
// RoleManager.createRequestRoleIntent() instead.
return true;
}
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Slog.i(LOG_TAG, "Cannot find application info for " + callingPackage); Slog.i(LOG_TAG, "Cannot find application info for " + callingPackage);
return false;
} }
// Applications targeting Q should use RoleManager.createRequestRoleIntent() // Make sure RequestRoleActivity can know the calling package if we allow it.
// instead. intent.putExtra(Intent.EXTRA_CALLING_PACKAGE, callingPackage);
return applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q; return false;
} }
default: default:
return false; return false;