Merge "Persistent connection to DO/PO service." into oc-dev (24e1ad40) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IUserSwitchObserver.aidl \
		core/java/android/app/IWallpaperManager.aidl \
		core/java/android/app/IWallpaperManagerCallback.aidl \
		core/java/android/app/admin/IDeviceAdminService.aidl \
		core/java/android/app/admin/IDevicePolicyManager.aidl \
		core/java/android/app/trust/IStrongAuthTracker.aidl \
		core/java/android/app/trust/ITrustManager.aidl \

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -6232,6 +6232,11 @@ package android.app.admin {
		field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
		}

		public class DeviceAdminService extends android.app.Service {
		ctor public DeviceAdminService();
		method public final android.os.IBinder onBind(android.content.Intent);
		}

		public class DevicePolicyManager {
		method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int);
		method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
		@@ -6398,6 +6403,7 @@ package android.app.admin {
		method public void wipeData(int);
		field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
		field public static final java.lang.String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";
		field public static final java.lang.String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";
		field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
		field public static final java.lang.String ACTION_PROVISIONING_SUCCESSFUL = "android.app.action.PROVISIONING_SUCCESSFUL";

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -6435,6 +6435,11 @@ package android.app.admin {
		field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
		}

		public class DeviceAdminService extends android.app.Service {
		ctor public DeviceAdminService();
		method public final android.os.IBinder onBind(android.content.Intent);
		}

		public class DevicePolicyManager {
		method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int);
		method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
		@@ -6622,6 +6627,7 @@ package android.app.admin {
		field public static final java.lang.String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";
		field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
		field public static final java.lang.String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";
		field public static final java.lang.String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";
		field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
		field public static final java.lang.String ACTION_PROVISIONING_SUCCESSFUL = "android.app.action.PROVISIONING_SUCCESSFUL";

api/test-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -6251,6 +6251,11 @@ package android.app.admin {
		field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
		}

		public class DeviceAdminService extends android.app.Service {
		ctor public DeviceAdminService();
		method public final android.os.IBinder onBind(android.content.Intent);
		}

		public class DevicePolicyManager {
		method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int);
		method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
		@@ -6426,6 +6431,7 @@ package android.app.admin {
		field public static final java.lang.String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";
		field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
		field public static final java.lang.String ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED = "android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED";
		field public static final java.lang.String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";
		field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
		field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
		field public static final java.lang.String ACTION_PROVISIONING_SUCCESSFUL = "android.app.action.PROVISIONING_SUCCESSFUL";

core/java/android/app/admin/DeviceAdminService.java

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.app.admin;

		import android.app.Service;
		import android.content.ComponentName;
		import android.content.Intent;
		import android.os.IBinder;

		/**
		* Base class for a service that device owner/profile owners can optionally have.
		*
		* <p>The system searches for it with an intent filter with the
		* {@link DevicePolicyManager#ACTION_DEVICE_ADMIN_SERVICE} action, and tries to keep a bound
		* connection as long as the hosting user is running, so that the device/profile owner is always
		* considered to be in the foreground.
		*
		* <p>Device/profile owners can use
		* {@link android.content.pm.PackageManager#setComponentEnabledSetting(ComponentName, int, int)}
		* to disable/enable its own service. For example, when a device/profile owner no longer needs
		* to be in the foreground, it can (and should) disable its service.
		*
		* <p>The service must not be exported.
		*
		* <p>TODO: Describe how the system handles crashes in DO/PO.
		*/
		public class DeviceAdminService extends Service {
		private final IDeviceAdminServiceImpl mImpl;

		public DeviceAdminService() {
		mImpl = new IDeviceAdminServiceImpl();
		}

		@Override
		public final IBinder onBind(Intent intent) {
		return mImpl.asBinder();
		}

		private class IDeviceAdminServiceImpl extends IDeviceAdminService.Stub {
		}

		// So far, we have no methods in this class.
		}