Merge "Install OEM default dialer and messages appi" (2ea68d5d) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+14 −16

Original line number	Original line	Diff line number	Diff line
	@@ -342,7 +342,6 @@ import android.security.keystore.AttestationUtils;
	import android.security.keystore.KeyGenParameterSpec;		import android.security.keystore.KeyGenParameterSpec;
	import android.security.keystore.ParcelableKeyGenParameterSpec;		import android.security.keystore.ParcelableKeyGenParameterSpec;
	import android.stats.devicepolicy.DevicePolicyEnums;		import android.stats.devicepolicy.DevicePolicyEnums;
	import android.telecom.TelecomManager;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	import android.telephony.data.ApnSetting;		import android.telephony.data.ApnSetting;
	@@ -20432,7 +20431,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
	final long id = mInjector.binderClearCallingIdentity();		final long id = mInjector.binderClearCallingIdentity();
	try {		try {
	int parentUserId = getProfileParentId(caller.getUserId());		int parentUserId = getProfileParentId(caller.getUserId());
	installOemDefaultDialerAndMessagesApp(parentUserId, caller.getUserId());		installOemDefaultDialerAndSmsApp(caller.getUserId());
	updateTelephonyCrossProfileIntentFilters(parentUserId, caller.getUserId(), true);		updateTelephonyCrossProfileIntentFilters(parentUserId, caller.getUserId(), true);
	} finally {		} finally {
	mInjector.binderRestoreCallingIdentity(id);		mInjector.binderRestoreCallingIdentity(id);
	@@ -20440,32 +20439,31 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
	}		}
	}		}

	private void installOemDefaultDialerAndMessagesApp(int sourceUserId, int targetUserId) {		private void installOemDefaultDialerAndSmsApp(int targetUserId) {
	try {		try {
	UserHandle sourceUserHandle = UserHandle.of(sourceUserId);		String defaultDialerPackageName = getDefaultRoleHolderPackageName(
	TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);		com.android.internal.R.string.config_defaultDialer);
	String dialerAppPackage = telecomManager.getDefaultDialerPackage(		String defaultSmsPackageName = getDefaultRoleHolderPackageName(
	sourceUserHandle);		com.android.internal.R.string.config_defaultSms);
	String messagesAppPackage = SmsApplication.getDefaultSmsApplicationAsUser(mContext,
	true, sourceUserHandle).getPackageName();		if (defaultDialerPackageName != null) {
	if (dialerAppPackage != null) {		mIPackageManager.installExistingPackageAsUser(defaultDialerPackageName,
	mIPackageManager.installExistingPackageAsUser(dialerAppPackage, targetUserId,		targetUserId, PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS,
	PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS,
	PackageManager.INSTALL_REASON_POLICY, null);		PackageManager.INSTALL_REASON_POLICY, null);
	} else {		} else {
	Slogf.w(LOG_TAG, "Couldn't install dialer app, dialer app package is null");		Slogf.w(LOG_TAG, "Couldn't install dialer app, dialer app package is null");
	}		}

	if (messagesAppPackage != null) {		if (defaultSmsPackageName != null) {
	mIPackageManager.installExistingPackageAsUser(messagesAppPackage, targetUserId,		mIPackageManager.installExistingPackageAsUser(defaultSmsPackageName, targetUserId,
	PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS,		PackageManager.INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS,
	PackageManager.INSTALL_REASON_POLICY, null);		PackageManager.INSTALL_REASON_POLICY, null);
	} else {		} else {
	Slogf.w(LOG_TAG, "Couldn't install messages app, messages app package is null");		Slogf.w(LOG_TAG, "Couldn't install sms app, sms app package is null");
	}		}
	} catch (RemoteException re) {		} catch (RemoteException re) {
	// shouldn't happen		// shouldn't happen
	Slogf.wtf(LOG_TAG, "Failed to install dialer/messages app", re);		Slogf.wtf(LOG_TAG, "Failed to install dialer/sms app", re);
	}		}
	}		}