Merge "Remove flag, switch to work profile for call dialog" into udc-dev am: 5a8de99c1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23121942
Change-Id: I999134850645e2820080358decbed6ad3f44a21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 382f999..fa7c2b7 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -80,7 +80,6 @@
import android.provider.BlockedNumberContract;
import android.provider.BlockedNumberContract.SystemContract;
import android.provider.CallLog.Calls;
-import android.provider.DeviceConfig;
import android.provider.Settings;
import android.sysprop.TelephonyProperties;
import android.telecom.CallAttributes;
@@ -1999,23 +1998,21 @@
return CompletableFuture.completedFuture(null);
}
if (accountSuggestions == null || accountSuggestions.isEmpty()) {
- if (isSwitchToManagedProfileDialogFlagEnabled()) {
- Uri callUri = callToPlace.getHandle();
- if (PhoneAccount.SCHEME_TEL.equals(callUri.getScheme())) {
- int managedProfileUserId = getManagedProfileUserId(mContext,
- initiatingUser.getIdentifier());
- if (managedProfileUserId != UserHandle.USER_NULL
- &&
- mPhoneAccountRegistrar.getCallCapablePhoneAccounts(
- handle.getScheme(), false,
- UserHandle.of(managedProfileUserId),
- false).size()
- != 0) {
- boolean dialogShown = showSwitchToManagedProfileDialog(
- callUri, initiatingUser, managedProfileUserId);
- if (dialogShown) {
- return CompletableFuture.completedFuture(null);
- }
+ Uri callUri = callToPlace.getHandle();
+ if (PhoneAccount.SCHEME_TEL.equals(callUri.getScheme())) {
+ int managedProfileUserId = getManagedProfileUserId(mContext,
+ initiatingUser.getIdentifier());
+ if (managedProfileUserId != UserHandle.USER_NULL
+ &&
+ mPhoneAccountRegistrar.getCallCapablePhoneAccounts(
+ handle.getScheme(), false,
+ UserHandle.of(managedProfileUserId),
+ false).size()
+ != 0) {
+ boolean dialogShown = showSwitchToManagedProfileDialog(
+ callUri, initiatingUser, managedProfileUserId);
+ if (dialogShown) {
+ return CompletableFuture.completedFuture(null);
}
}
}
@@ -2178,11 +2175,6 @@
return UserHandle.USER_NULL;
}
- private boolean isSwitchToManagedProfileDialogFlagEnabled() {
- return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
- "enable_switch_to_managed_profile_dialog", false);
- }
-
private boolean showSwitchToManagedProfileDialog(Uri callUri, UserHandle initiatingUser,
int managedProfileUserId) {
// Note that the ACTION_CALL intent will resolve to Telecomm's UserCallActivity