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

[MMS] Don't show error for non sms app

Browse Source 
Show "Switch to managed profile" dialog only in case of when message is
initiated from an SMS app in personal profile(and SIM user is associated
with managed profile).
We should not show this dialog in non SMS app case, as it may give
strange experience as seen in attached bug.

Bug: 268211439
Test: NA
Change-Id: Ie62ecca730312400b9ab759e8031433265b9f9cf
This commit is contained in:
Ayush Sharma
2023-03-17 16:02:13 +00:00
parent 11d35a35cf
commit 395d193693
2 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/MmsServiceBroker.java
View File

@@ -343,10 +343,8 @@ public class MmsServiceBroker extends SystemService {
// Check if user is associated with the subscription
if (!TelephonyPermissions.checkSubscriptionAssociatedWithUser(mContext, subId,
Binder.getCallingUserHandle())) {
if (TelephonyUtils.isUidForeground(mContext, Binder.getCallingUid())) {
TelephonyUtils.showErrorIfSubscriptionAssociatedWithManagedProfile(mContext,
subId);
}
TelephonyUtils.showSwitchToManagedProfileDialogIfAppropriate(mContext,
subId, Binder.getCallingUid(), callingPkg);
return;
}

53
telephony/common/com/android/internal/telephony/util/TelephonyUtils.java
View File

@@ -20,6 +20,7 @@ import static android.telephony.Annotation.DataState;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.role.RoleManager;
import android.content.Context;
import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager;
@@ -255,15 +256,26 @@ public final class TelephonyUtils {
* Show switch to managed profile dialog if subscription is associated with managed profile.
*
* @param context Context object
* @param subId subscription id
* @param subId subscription id
* @param callingUid uid for the calling app
* @param callingPackage package name of the calling app
*/
public static void showErrorIfSubscriptionAssociatedWithManagedProfile(Context context,
int subId) {
public static void showSwitchToManagedProfileDialogIfAppropriate(Context context,
int subId, int callingUid, String callingPackage) {
if (!isSwitchToManagedProfileDialogFlagEnabled()) {
return;
}
final long token = Binder.clearCallingIdentity();
try {
UserHandle callingUserHandle = UserHandle.getUserHandleForUid(callingUid);
// We only want to show this dialog, while user actually trying to send the message from
// a messaging app, in other cases this dialog don't make sense.
if (!TelephonyUtils.isUidForeground(context, callingUid)
|| !TelephonyUtils.isPackageSMSRoleHolderForUser(context, callingPackage,
callingUserHandle)) {
return;
}
SubscriptionManager subscriptionManager = context.getSystemService(
SubscriptionManager.class);
UserHandle associatedUserHandle = subscriptionManager.getSubscriptionUserHandle(subId);
@@ -295,22 +307,25 @@ public final class TelephonyUtils {
"enable_switch_to_managed_profile_dialog", false);
}
/**
* Check if the process with given uid is foreground.
*
* @param context context
* @param uid the caller uid
* @return true if the process with uid is foreground, false otherwise.
*/
public static boolean isUidForeground(Context context, int uid) {
final long token = Binder.clearCallingIdentity();
try {
ActivityManager am = context.getSystemService(ActivityManager.class);
boolean result = am != null && am.getUidImportance(uid)
== ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
return result;
} finally {
Binder.restoreCallingIdentity(token);
private static boolean isUidForeground(Context context, int uid) {
ActivityManager am = context.getSystemService(ActivityManager.class);
boolean result = am != null && am.getUidImportance(uid)
== ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
return result;
}
private static boolean isPackageSMSRoleHolderForUser(Context context, String callingPackage,
UserHandle user) {
RoleManager roleManager = context.getSystemService(RoleManager.class);
final List<String> smsRoleHolder = roleManager.getRoleHoldersAsUser(
RoleManager.ROLE_SMS, user);
// ROLE_SMS is an exclusive role per user, so there would just be one entry in the
// retuned list if not empty
if (!smsRoleHolder.isEmpty() && callingPackage.equals(smsRoleHolder.get(0))) {
return true;
}
return false;
}
}