Merge "Add DevicePolicyManager#setDefaultSmsApplication" (fc7c7498) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -5626,6 +5626,29 @@ public class DevicePolicyManager {
		}
		}

		/**
		* Called by a device owner to set the default SMS application.
		* <p>
		* The calling device admin must be a device owner. If it is not, a security exception will be
		* thrown.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param packageName The name of the package to set as the default SMS application.
		* @throws SecurityException if {@code admin} is not a device owner.
		*
		* @hide
		*/
		public void setDefaultSmsApplication(@NonNull ComponentName admin, String packageName) {
		throwIfParentInstance("setDefaultSmsApplication");
		if (mService != null) {
		try {
		mService.setDefaultSmsApplication(admin, packageName);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

		/**
		* Called by a profile owner or device owner to grant permission to a package to manage
		* application restrictions for the calling user via {@link #setApplicationRestrictions} and

+2 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,8 @@ interface IDevicePolicyManager {
		void addPersistentPreferredActivity(in ComponentName admin, in IntentFilter filter, in ComponentName activity);
		void clearPackagePersistentPreferredActivities(in ComponentName admin, String packageName);

		void setDefaultSmsApplication(in ComponentName admin, String packageName);

		void setApplicationRestrictions(in ComponentName who, in String callerPackage, in String packageName, in Bundle settings);
		Bundle getApplicationRestrictions(in ComponentName who, in String callerPackage, in String packageName);
		boolean setApplicationRestrictionsManagingPackage(in ComponentName admin, in String packageName);

+4 −0

Original line number	Diff line number	Diff line
		@@ -172,4 +172,8 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {
		public long forceSecurityLogs() {
		return 0;
		}

		@Override
		public void setDefaultSmsApplication(ComponentName admin, String packageName) {
		}
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@ import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.notification.SystemNotificationChannels;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.internal.telephony.SmsApplication;
		import com.android.internal.util.DumpUtils;
		import com.android.internal.util.FastXmlSerializer;
		import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
		@@ -8216,6 +8217,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}

		@Override
		public void setDefaultSmsApplication(ComponentName admin, String packageName) {
		Preconditions.checkNotNull(admin, "ComponentName is null");
		synchronized (this) {
		getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
		}
		mInjector.binderWithCleanCallingIdentity(() ->
		SmsApplication.setDefaultApplication(packageName, mContext));
		}

		@Override
		public boolean setApplicationRestrictionsManagingPackage(ComponentName admin,
		String packageName) {