Snap for 5681426 from 25a43f362acfb32c2939d2406593ea8dad4f2cf4 to qt-release (da2cc902) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9808,6 +9808,7 @@ package android.content {
		field public static final int BIND_IMPORTANT = 64; // 0x40
		field public static final int BIND_INCLUDE_CAPABILITIES = 4096; // 0x1000
		field public static final int BIND_NOT_FOREGROUND = 4; // 0x4
		field public static final int BIND_NOT_PERCEPTIBLE = 256; // 0x100
		field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20
		field public static final String BIOMETRIC_SERVICE = "biometric";
		field public static final String BLUETOOTH_SERVICE = "bluetooth";

cmds/app_process/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ app_process_common_shared_libs := \
		libbinder \
		libcutils \
		libdl \
		libhwbinder \
		libhidlbase \
		liblog \
		libnativeloader \
		libutils \

cmds/statsd/src/atoms.proto

+140 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,16 @@ message Atom {
		212 [(log_from_module) = "permissioncontroller"];
		GrantPermissionsActivityButtonActions grant_permissions_activity_button_actions =
		213 [(log_from_module) = "permissioncontroller"];
		LocationAccessCheckNotificationAction location_access_check_notification_action =
		214 [(log_from_module) = "permissioncontroller"];
		AppPermissionFragmentActionReported app_permission_fragment_action_reported =
		215 [(log_from_module) = "permissioncontroller"];
		AppPermissionFragmentViewed app_permission_fragment_viewed =
		216 [(log_from_module) = "permissioncontroller"];
		AppPermissionsFragmentViewed app_permissions_fragment_viewed =
		217 [(log_from_module) = "permissioncontroller"];
		PermissionAppsFragmentViewed permission_apps_fragment_viewed =
		218 [(log_from_module) = "permissioncontroller"];
		}

		// Pulled events will start at field 10000.
		@@ -6607,3 +6617,133 @@ message GrantPermissionsActivityButtonActions {
		// Button clicked by user - same as bit flags in buttons_presented with only single bit set
		optional int32 button_clicked = 5;
		}

		/**
		* Information about LocationAccessCheck notification presented to user
		*/
		message LocationAccessCheckNotificationAction {

		// id which identifies single session of user interacting with permission controller
		optional int64 session_id = 1;

		// Uid of package for which location access check is presented
		optional int32 package_uid = 2;

		// Name of package for which location access check is presented
		optional string package_name = 3;

		enum Result {
		UNDEFINED = 0;
		// notification was presented to the user
		NOTIFICATION_PRESENTED = 1;
		// notification was declined by the user
		NOTIFICATION_DECLINED = 2;
		// notification was clicked by the user
		NOTIFICATION_CLICKED = 3;
		}

		// View / interaction recorded
		optional Result result = 4;
		}

		/**
		* Information about a permission grant or revoke made by user inside AppPermissionFragment
		*/
		message AppPermissionFragmentActionReported {
		// id which identifies single session of user interacting with permission controller
		optional int64 session_id = 1;

		// unique value identifying a permission group change. A permission group change might result
		// in multiple of these atoms
		optional int64 change_id = 2;

		// UID of package the permission belongs to
		optional int32 uid = 3 [(is_uid) = true];

		// Name of package the permission belongs to
		optional string package_name = 4;

		// The permission to be granted
		optional string permission_name = 5;

		// The result of the permission grant
		optional bool permission_granted = 6;
		}

		/**
		* Information about a AppPermissionFragment viewed by user
		*/
		message AppPermissionFragmentViewed {
		// id which identifies single session of user interacting with permission controller
		optional int64 session_id = 1;

		// UID of package for which permissions are viewed
		optional int32 uid = 2 [(is_uid) = true];

		// Name of package for which permissions are viewed
		optional string package_name = 3;

		// Permission group viewed
		optional string permission_group_name = 4;
		}

		/**
		* Information about a AppPermissionsFragment viewed by user
		*/
		message AppPermissionsFragmentViewed {
		// id which identifies single session of user interacting with permission controller
		optional int64 session_id = 1;

		// id which identifies single view as every view might have several logging records
		// with different package information attached
		optional int64 view_id = 2;

		// Permission group viewed
		optional string permission_group_name = 3;

		// UID of package for which permissions are viewed
		optional int32 uid = 4 [(is_uid) = true];

		// Name of package for which permissions are viewed
		optional string package_name = 5;

		// Category in which permission is included
		enum Category {
		UNDEFINED = 0;
		ALLOWED = 1;
		ALLOWED_FOREGROUND = 2;
		DENIED = 3;
		}
		optional Category category = 6;
		}

		/**
		* Information about a PermissionAppsFragment viewed by user.
		* Logged from ui/handheld/PermissionAppsFragment.java
		*/
		message PermissionAppsFragmentViewed {
		// id which identifies single session of user interacting with permission controller
		optional int64 session_id = 1;

		// id which identifies single view as every view might have several logging records
		// with different package information attached
		optional int64 view_id = 2;

		// Permission group viewed
		optional string permission_group_name = 3;

		// UID of package for which permissions are viewed
		optional int32 uid = 4 [(is_uid) = true];

		// Name of package for which permissions are viewed
		optional string package_name = 5;

		// Category in which app is included
		enum Category {
		UNDEFINED = 0;
		ALLOWED = 1;
		ALLOWED_FOREGROUND = 2;
		DENIED = 3;
		}
		optional Category category = 6;
		}

config/boot-image-profile.txt

+5117 −790

File changed.

File size exceeds preview limit.

View original file

View changed file

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -278,6 +278,7 @@ public class DevicePolicyManager {
		* <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>
		* </ul>
		*
		* <p>When device owner provisioning has completed, an intent of the type
		@@ -385,6 +386,8 @@ public class DevicePolicyManager {
		* <li>{@link #EXTRA_PROVISIONING_ORGANIZATION_NAME}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_USE_MOBILE_DATA}, optional </li>
		* <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional - when not used for
		* cloud enrollment, NFC or QR provisioning</li>
		* </ul>
		*
		* @hide
		@@ -1149,8 +1152,12 @@ public class DevicePolicyManager {
		* A boolean extra indicating if the education screens from the provisioning flow should be
		* skipped. If unspecified, defaults to {@code false}.
		*
		* <p>This extra can only be set by the admin app when performing the admin-integrated
		* provisioning flow as a result of the {@link #ACTION_GET_PROVISIONING_MODE} activity.
		* <p>This extra can be set in the following ways:
		* <ul>
		* <li>By the admin app when performing the admin-integrated
		* provisioning flow as a result of the {@link #ACTION_GET_PROVISIONING_MODE} activity</li>
		* <li>With intent action {@link #ACTION_PROVISION_MANAGED_DEVICE}</li>
		* </ul>
		*
		* <p>If the education screens are skipped, it is the admin application's responsibility
		* to display its own user education screens.