Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 996edee3 authored Jan 22, 2020 by Mathew Inwood Committed by Android (Google) Code Review Jan 22, 2020

Merge "Fix some @link tags in @ChangeId docs."

parents ac3c3256 12be21dc

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -378,8 +378,9 @@ public class NotificationManagerService extends SystemService {

		/**
		* Apps that post custom toasts in the background will have those blocked. Apps can
		* still post toasts created with {@link Toast#makeText(Context, CharSequence, int)} and its
		* variants while in the background.
		* still post toasts created with
		* {@link android.widget.Toast#makeText(Context, CharSequence, int)} and its variants while
		* in the background.
		*
		* TODO(b/144152069): Add @EnabledAfter(Q) to target R+ after assessing impact on dogfood
		*/

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -527,11 +527,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		/**
		* For admin apps targeting R+, throw when the app sets password requirement
		* that is not taken into account at given quality. For example when quality is set
		* to {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, it doesn't make sense to
		* require certain password length. If the intent is to require a password of certain length
		* having at least NUMERIC quality, the admin should first call
		* {@link #setPasswordQuality(ComponentName, int, boolean)} and only then call
		* {@link #setPasswordMinimumLength(ComponentName, int, boolean)}.
		* to {@link android.app.admin.DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}, it doesn't
		* make sense to require certain password length. If the intent is to require a password of
		* certain length having at least NUMERIC quality, the admin should first call
		* {@link android.app.admin.DevicePolicyManager#setPasswordQuality} and only then call
		* {@link android.app.admin.DevicePolicyManager#setPasswordMinimumLength}.
		*
		* <p>Conversely when an admin app targeting R+ lowers password quality, those
		* requirements that stop making sense are reset to default values.

telephony/java/android/telephony/PreciseDataConnectionState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ public final class PreciseDataConnectionState implements Parcelable {
		}

		/**
		* To check the SDK version for {@link PreciseDataConnectionState#getDataConnectionState}.
		* To check the SDK version for {@code PreciseDataConnectionState#getDataConnectionState}.
		*/
		@ChangeId
		@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)