Snap for 5637134 from f8dbc5f6f135a108b31adac5228b44d99eba6816 to qt-release (13944de9) · Commits · e / os / android_frameworks_base

cmds/incidentd/src/IncidentService.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,8 @@ status_t IncidentService::dump(int fd, const Vector<String16>& args) {
		int skipped[] = SKIPPED_SECTIONS;
		for (const Section** section = SECTION_LIST; *section; section++) {
		const int id = (*section)->id;
		if (std::find(std::begin(skipped), std::end(skipped), id) == std::end(skipped)) {
		if (std::find(std::begin(skipped), std::end(skipped), id) == std::end(skipped)
		&& !section_requires_specific_mention(id)) {
		incidentArgs.addSection(id);
		}
		}

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -275,7 +275,6 @@ 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
		@@ -383,7 +382,6 @@ 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</li>
		* </ul>
		*
		* @hide
		@@ -423,7 +421,6 @@ public class DevicePolicyManager {
		* <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>
		* <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>
		* </ul>
		*
		* <p>When device owner provisioning has completed, an intent of the type
		@@ -1149,11 +1146,11 @@ 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>If the education screens are skipped, it is the admin application's responsibility
		* to display its own user education screens.
		*
		* <p>It can be used when provisioning a fully managed device via
		* {@link #ACTION_PROVISION_MANAGED_DEVICE}.
		*/
		public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS =
		"android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";
		@@ -2263,6 +2260,10 @@ public class DevicePolicyManager {
		* <li>{@link #PROVISIONING_MODE_MANAGED_PROFILE}</li>
		* </ul>
		*
		* <p>If performing fully-managed device provisioning and the admin app desires to show its
		* own education screens, the target activity can additionally return
		* {@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS} set to <code>true</code>.
		*
		* <p>The target activity may also return the account that needs to be migrated from primary
		* user to managed profile in case of a profile owner provisioning in
		* {@link #EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE} as result.

core/java/android/hardware/SensorAdditionalInfo.java

+43 −5

Original line number	Diff line number	Diff line
		@@ -119,12 +119,50 @@ public class SensorAdditionalInfo {
		public static final int TYPE_VEC3_CALIBRATION = 0x10002;

		/**
		* Sensor placement. Describes location and installation angle of the sensor device.
		* Sensor placement.
		*
		* Payload:
		* floatValues[0..11]: First 3 rows of homogeneous matrix in row major order that describes
		* the location and orientation of the sensor. Origin of reference will be the mobile device
		* geometric sensor. Reference frame is defined as the same as Android sensor frame.
		* Provides the orientation and location of the sensor element in terms of the
		* Android coordinate system. This data is given as a 3x4 matrix consisting of a 3x3 rotation
		* matrix (R) concatenated with a 3x1 location vector (t). The rotation matrix provides the
		* orientation of the Android device coordinate frame relative to the local coordinate frame of
		* the sensor. Note that assuming the axes conventions of the sensor are the same as Android,
		* this is the inverse of the matrix applied to raw samples read from the sensor to convert them
		* into the Android representation. The location vector represents the translation from the
		* origin of the Android sensor coordinate system to the geometric center of the sensor,
		* specified in millimeters (mm).
		* <p>
		* <b>Payload</b>:
		* <code>floatValues[0..11]</code>: 3x4 matrix in row major order [R; t]
		* </p>
		* <p>
		* <b>Example</b>:
		* This raw buffer: <code>{0, 1, 0, 0, -1, 0, 0, 10, 0, 0, 1, -2.5}</code><br>
		* Corresponds to this 3x4 matrix:
		* <table>
		* <thead>
		* <tr><td colspan="3">Orientation</td><td>Location</tr>
		* </thead>
		* <tbody>
		* <tr><td>0</td><td>1</td><td>0</td><td>0</td></tr>
		* <tr><td>-1</td><td>0</td><td>0</td><td>10</td></tr>
		* <tr><td>0</td><td>0</td><td>1</td><td>-2.5</td></tr>
		* </tbody>
		* </table>
		* The sensor is oriented such that:
		* <ul>
		* <li>The device X axis corresponds to the sensor's local -Y axis
		* <li>The device Y axis corresponds to the sensor's local X axis
		* <li>The device Z axis and sensor's local Z axis are equivalent
		* </ul>
		* In other words, if viewing the origin of the Android coordinate system from the positive
		* Z direction, the device coordinate frame is to be rotated 90° counter-clockwise about the
		* Z axis to align with the sensor's local coordinate frame. Equivalently, a vector in the
		* Android coordinate frame may be multiplied with R to rotate it 90° clockwise (270°
		* counter-clockwise), yielding its representation in the sensor's coordinate frame.
		* Relative to the origin of the Android coordinate system, the physical center of the
		* sensor is located 10mm in the positive Y direction, and 2.5mm in the negative Z
		* direction.
		* </p>
		*/
		public static final int TYPE_SENSOR_PLACEMENT = 0x10003;

core/java/android/os/VibrationEffect.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -330,18 +330,25 @@ public abstract class VibrationEffect implements Parcelable {
		@TestApi
		@Nullable
		public static VibrationEffect get(Uri uri, Context context) {
		final ContentResolver cr = context.getContentResolver();
		Uri uncanonicalUri = cr.uncanonicalize(uri);
		if (uncanonicalUri == null) {
		// If we already had an uncanonical URI, it's possible we'll get null back here. In
		// this case, just use the URI as passed in since it wasn't canonicalized in the first
		// place.
		uncanonicalUri = uri;
		}
		String[] uris = context.getResources().getStringArray(
		com.android.internal.R.array.config_ringtoneEffectUris);
		for (int i = 0; i < uris.length && i < RINGTONES.length; i++) {
		if (uris[i] == null) {
		continue;
		}
		ContentResolver cr = context.getContentResolver();
		Uri mappedUri = cr.uncanonicalize(Uri.parse(uris[i]));
		if (mappedUri == null) {
		continue;
		}
		if (mappedUri.equals(uri)) {
		if (mappedUri.equals(uncanonicalUri)) {
		return get(RINGTONES[i]);
		}
		}

core/java/com/android/internal/app/ResolverActivity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,8 @@ public class ResolverActivity extends Activity {
		mSystemWindowInsets.bottom));
		((ListView) mAdapterView).addFooterView(mFooterSpacer);

		resetButtonBar();

		return insets.consumeSystemWindowInsets();
		}