Snap for 5681502 from d5e9e9c87452b97e07000db42a91242eb485df1e to qt-c2f2-release (32721db7) · 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

+142 −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.
		@@ -3280,6 +3290,8 @@ message BiometricErrorOccurred {
		optional int32 error_info_vendor = 7;
		// Dictates if this message should trigger additional debugging.
		optional bool debug = 8;
		// Time spent during the authentication attempt.
		optional int64 latency_millis = 9;
		}

		/**
		@@ -6607,3 +6619,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.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ActivityThread.java

+23 −5

Original line number	Diff line number	Diff line
		@@ -2080,7 +2080,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		@Override
		public final boolean queueIdle() {
		doGcIfNeeded();
		nPurgePendingResources();
		purgePendingResources();
		return false;
		}
		}
		@@ -2088,9 +2088,7 @@ public final class ActivityThread extends ClientTransactionHandler {
		final class PurgeIdler implements MessageQueue.IdleHandler {
		@Override
		public boolean queueIdle() {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "purgePendingResources");
		nPurgePendingResources();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		purgePendingResources();
		return false;
		}
		}
		@@ -2460,13 +2458,17 @@ public final class ActivityThread extends ClientTransactionHandler {
		}

		void doGcIfNeeded() {
		doGcIfNeeded("bg");
		}

		void doGcIfNeeded(String reason) {
		mGcIdlerScheduled = false;
		final long now = SystemClock.uptimeMillis();
		//Slog.i(TAG, "**** WE MIGHT WANT TO GC: then=" + Binder.getLastGcTime()
		// + "m now=" + now);
		if ((BinderInternal.getLastGcTime()+MIN_TIME_BETWEEN_GCS) < now) {
		//Slog.i(TAG, "**** WE DO, WE DO WANT TO GC!");
		BinderInternal.forceGc("bg");
		BinderInternal.forceGc(reason);
		}
		}

		@@ -6006,6 +6008,16 @@ public final class ActivityThread extends ClientTransactionHandler {

		WindowManagerGlobal.getInstance().trimMemory(level);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

		if (SystemProperties.getInt("debug.am.run_gc_trim_level", Integer.MAX_VALUE) <= level) {
		unscheduleGcIdler();
		doGcIfNeeded("tm");
		}
		if (SystemProperties.getInt("debug.am.run_mallopt_trim_level", Integer.MAX_VALUE)
		<= level) {
		unschedulePurgeIdler();
		purgePendingResources();
		}
		}

		private void setupGraphicsSupport(Context context) {
		@@ -7346,6 +7358,12 @@ public final class ActivityThread extends ClientTransactionHandler {
		throw new RuntimeException("Main thread loop unexpectedly exited");
		}

		private void purgePendingResources() {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "purgePendingResources");
		nPurgePendingResources();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}

		// ------------------ Regular JNI ------------------------
		private native void nPurgePendingResources();
		private native void nDumpGraphicsInfo(FileDescriptor fd);