Snap for 10309372 from 92437274a7d6459f953b1a928dd1f5bcc3ea4f85 to udc-qpr1-release (889a825a) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -2958,6 +2958,10 @@ package android.service.notification {
		method @Deprecated public boolean isBound();
		}

		public class NotificationRankingUpdate implements android.os.Parcelable {
		method public final boolean isFdNotNullAndClosed();
		}

		}

		package android.service.quickaccesswallet {

core/java/android/app/KeyguardManager.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,17 @@ public class KeyguardManager {
		public static final String ACTION_CONFIRM_REMOTE_DEVICE_CREDENTIAL =
		"android.app.action.CONFIRM_REMOTE_DEVICE_CREDENTIAL";

		/**
		* Intent used to prompt user for device credential for entering repair
		* mode. If the credential is verified successfully, then the information
		* needed to verify the credential again will be written to a location that
		* is available to repair mode. This makes it possible for repair mode to
		* require that the same credential be provided to exit repair mode.
		* @hide
		*/
		public static final String ACTION_PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL =
		"android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL";

		/**
		* A CharSequence dialog title to show to the user when used with a
		* {@link #ACTION_CONFIRM_DEVICE_CREDENTIAL}.

core/java/android/app/TaskInfo.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,12 @@ public class TaskInfo {
		*/
		public boolean isVisible;

		/**
		* Whether this task is request visible.
		* @hide
		*/
		public boolean isVisibleRequested;

		/**
		* Whether this task is sleeping due to sleeping display.
		* @hide
		@@ -518,6 +524,7 @@ public class TaskInfo {
		&& Objects.equals(taskDescription, that.taskDescription)
		&& isFocused == that.isFocused
		&& isVisible == that.isVisible
		&& isVisibleRequested == that.isVisibleRequested
		&& isSleeping == that.isSleeping
		&& Objects.equals(mTopActivityLocusId, that.mTopActivityLocusId)
		&& parentTaskId == that.parentTaskId
		@@ -591,6 +598,7 @@ public class TaskInfo {
		parentTaskId = source.readInt();
		isFocused = source.readBoolean();
		isVisible = source.readBoolean();
		isVisibleRequested = source.readBoolean();
		isSleeping = source.readBoolean();
		topActivityInSizeCompat = source.readBoolean();
		topActivityEligibleForLetterboxEducation = source.readBoolean();
		@@ -644,6 +652,7 @@ public class TaskInfo {
		dest.writeInt(parentTaskId);
		dest.writeBoolean(isFocused);
		dest.writeBoolean(isVisible);
		dest.writeBoolean(isVisibleRequested);
		dest.writeBoolean(isSleeping);
		dest.writeBoolean(topActivityInSizeCompat);
		dest.writeBoolean(topActivityEligibleForLetterboxEducation);
		@@ -687,6 +696,7 @@ public class TaskInfo {
		+ " parentTaskId=" + parentTaskId
		+ " isFocused=" + isFocused
		+ " isVisible=" + isVisible
		+ " isVisibleRequested=" + isVisibleRequested
		+ " isSleeping=" + isSleeping
		+ " topActivityInSizeCompat=" + topActivityInSizeCompat
		+ " topActivityEligibleForLetterboxEducation= "

core/java/android/app/WallpaperManager.java

+33 −7

Original line number	Diff line number	Diff line
		@@ -2476,19 +2476,38 @@ public class WallpaperManager {
		}

		/**
		* Reset all wallpaper to the factory default.
		* Reset all wallpaper to the factory default. As opposed to {@link #clear()}, if the device
		* is configured to have a live wallpaper by default, apply it.
		*
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#SET_WALLPAPER}.
		*/
		@RequiresPermission(android.Manifest.permission.SET_WALLPAPER)
		public void clearWallpaper() {
		if (isLockscreenLiveWallpaperEnabled()) {
		clearWallpaper(FLAG_LOCK \| FLAG_SYSTEM, mContext.getUserId());
		return;
		}
		clearWallpaper(FLAG_LOCK, mContext.getUserId());
		clearWallpaper(FLAG_SYSTEM, mContext.getUserId());
		}

		/**
		* Clear the wallpaper for a specific user. The caller must hold the
		* Clear the wallpaper for a specific user.
		* <ul>
		* <li> When called with {@code which=}{@link #FLAG_LOCK}, clear the lockscreen wallpaper.
		* The home screen wallpaper will become visible on the lock screen. </li>
		*
		* <li> When called with {@code which=}{@link #FLAG_SYSTEM}, revert the home screen
		* wallpaper to default. The lockscreen wallpaper will be unchanged: if the previous
		* wallpaper was shared between home and lock screen, it will become lock screen only. </li>
		*
		* <li> When called with {@code which=}({@link #FLAG_LOCK} \| {@link #FLAG_SYSTEM}), put the
		* default wallpaper on both home and lock screen, removing any user defined wallpaper.</li>
		* </ul>
		* </p>
		*
		* The caller must hold the
		* INTERACT_ACROSS_USERS_FULL permission to clear another user's
		* wallpaper, and must hold the SET_WALLPAPER permission in all
		* circumstances.
		@@ -2793,8 +2812,9 @@ public class WallpaperManager {

		/**
		* Remove any currently set system wallpaper, reverting to the system's built-in
		* wallpaper. On success, the intent {@link Intent#ACTION_WALLPAPER_CHANGED}
		* is broadcast.
		* wallpaper. As opposed to {@link #clearWallpaper()}, this method always set a static wallpaper
		* with the default image, even if the device is configured to have a live wallpaper by default.
		* On success, the intent {@link Intent#ACTION_WALLPAPER_CHANGED} is broadcast.
		*
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#SET_WALLPAPER}.
		@@ -2809,9 +2829,14 @@ public class WallpaperManager {

		/**
		* Remove one or more currently set wallpapers, reverting to the system default
		* display for each one. If {@link #FLAG_SYSTEM} is set in the {@code which}
		* parameter, the intent {@link Intent#ACTION_WALLPAPER_CHANGED} will be broadcast
		* upon success.
		* display for each one. On success, the intent {@link Intent#ACTION_WALLPAPER_CHANGED}
		* is broadcast.
		* <ul>
		* <li> If {@link #FLAG_SYSTEM} is set in the {@code which} parameter, put the default
		* wallpaper on both home and lock screen, removing any user defined wallpaper. </li>
		* <li> When called with {@code which=}{@link #FLAG_LOCK}, clear the lockscreen wallpaper.
		* The home screen wallpaper will become visible on the lock screen. </li>
		* </ul>
		*
		* @param which A bitwise combination of {@link #FLAG_SYSTEM} or
		* {@link #FLAG_LOCK}
		@@ -2821,6 +2846,7 @@ public class WallpaperManager {
		public void clear(@SetWallpaperFlags int which) throws IOException {
		if ((which & FLAG_SYSTEM) != 0) {
		clear();
		if (isLockscreenLiveWallpaperEnabled()) return;
		}
		if ((which & FLAG_LOCK) != 0) {
		clearWallpaper(FLAG_LOCK, mContext.getUserId());

core/java/android/app/admin/WifiSsidPolicy.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,10 @@ public final class WifiSsidPolicy implements Parcelable {
		dest.writeArraySet(mSsids);
		}

		/**
		* Two instances of WifiSsidPolicy is considered equal if they have
		* the same WifiSsidPolicyType and the same set of WifiSsids
		*/
		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		@@ -147,6 +151,9 @@ public final class WifiSsidPolicy implements Parcelable {
		return mPolicyType == that.mPolicyType && Objects.equals(mSsids, that.mSsids);
		}

		/**
		* Returns the hash code value of WifiSsidPolicyType and WifiSsid set
		*/
		@Override
		public int hashCode() {
		return Objects.hash(mPolicyType, mSsids);