Snap for 8503143 from 7c8c8e8729b6cd7dfe6fd145703e1472cec7846b to tm-qpr1-release (1ec1f850) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -464,6 +464,7 @@ package android.app {
		method @NonNull public android.graphics.Rect getMaxBounds();
		method public int getRotation();
		method public int getWindowingMode();
		method public static boolean isFloating(int);
		method public void setActivityType(int);
		method public void setAppBounds(android.graphics.Rect);
		method public void setBounds(android.graphics.Rect);

core/java/android/app/Notification.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -1901,6 +1901,11 @@ public class Notification implements Parcelable

		/**
		* Construct a new builder for {@link Action} object.
		* <p>As of Android {@link android.os.Build.VERSION_CODES#N},
		* action button icons will not be displayed on action buttons, but are still required
		* and are available to
		* {@link android.service.notification.NotificationListenerService notification listeners},
		* which may display them in other contexts, for example on a wearable device.
		* @param icon icon to show for this action
		* @param title the title of the action
		* @param intent the {@link PendingIntent} to fire when users trigger this action
		@@ -1923,6 +1928,12 @@ public class Notification implements Parcelable
		* both are displayed or required, depends on where and how the action is used, and the
		* {@link Style} applied to the Notification.
		*
		* <p>As of Android {@link android.os.Build.VERSION_CODES#N}, action button icons
		* will not be displayed on action buttons, but are still required and are available
		* to {@link android.service.notification.NotificationListenerService notification
		* listeners}, which may display them in other contexts, for example on a wearable
		* device.
		*
		* <p>When the {@code title} is a {@link android.text.Spanned}, any colors set by a
		* {@link ForegroundColorSpan} or {@link TextAppearanceSpan} may be removed or displayed
		* with an altered in luminance to ensure proper contrast within the Notification.
		@@ -4918,6 +4929,12 @@ public class Notification implements Parcelable
		* while processing broadcast receivers or services in response to notification action
		* clicks. To launch an activity in those cases, provide a {@link PendingIntent} to the
		* activity itself.
		* <p>
		* As of Android {@link android.os.Build.VERSION_CODES#N},
		* action button icons will not be displayed on action buttons, but are still required
		* and are available to
		* {@link android.service.notification.NotificationListenerService notification listeners},
		* which may display them in other contexts, for example on a wearable device.
		*
		* @param icon Resource ID of a drawable that represents the action.
		* @param title Text describing the action.

core/java/android/app/WindowConfiguration.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -819,11 +819,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
		return isFloating(mWindowingMode);
		}

		/**
		* Returns true if the windowingMode represents a floating window.
		* @hide
		*/
		public static boolean isFloating(int windowingMode) {
		/** Returns true if the windowingMode represents a floating window. */
		public static boolean isFloating(@WindowingMode int windowingMode) {
		return windowingMode == WINDOWING_MODE_FREEFORM \|\| windowingMode == WINDOWING_MODE_PINNED;
		}

core/java/android/app/admin/PreferentialNetworkServiceConfig.java

+161 −2

Original line number	Diff line number	Diff line
		@@ -16,15 +16,31 @@

		package android.app.admin;

		import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
		import static org.xmlpull.v1.XmlPullParser.END_TAG;
		import static org.xmlpull.v1.XmlPullParser.TEXT;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.TypedXmlPullParser;
		import android.util.TypedXmlSerializer;

		import org.xmlpull.v1.XmlPullParserException;

		import java.io.IOException;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.List;
		import java.util.Objects;
		import java.util.stream.Collectors;

		/**
		* Network configuration to be set for the user profile
		@@ -37,6 +53,20 @@ public final class PreferentialNetworkServiceConfig implements Parcelable {
		final int[] mIncludedUids;
		final int[] mExcludedUids;

		private static final String LOG_TAG = "PreferentialNetworkServiceConfig";
		private static final String TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG =
		"preferential_network_service_config";
		private static final String TAG_CONFIG_ENABLED =
		"preferential_network_service_config_enabled";
		private static final String TAG_UID = "uid";
		private static final String TAG_NETWORK_ID =
		"preferential_network_service_network_id";
		private static final String TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION =
		"allow_fallback_to_default_connection";
		private static final String TAG_INCLUDED_UIDS = "included_uids";
		private static final String TAG_EXCLUDED_UIDS = "excluded_uids";
		private static final String ATTR_VALUE = "value";

		/** @hide */
		public static final PreferentialNetworkServiceConfig DEFAULT =
		(new PreferentialNetworkServiceConfig.Builder()).build();
		@@ -159,8 +189,8 @@ public final class PreferentialNetworkServiceConfig implements Parcelable {
		return "PreferentialNetworkServiceConfig{"
		+ "mIsEnabled=" + isEnabled()
		+ "mAllowFallbackToDefaultConnection=" + isFallbackToDefaultConnectionAllowed()
		+ "mIncludedUids=" + mIncludedUids.toString()
		+ "mExcludedUids=" + mExcludedUids.toString()
		+ "mIncludedUids=" + Arrays.toString(mIncludedUids)
		+ "mExcludedUids=" + Arrays.toString(mExcludedUids)
		+ "mNetworkId=" + mNetworkId
		+ '}';
		}
		@@ -309,6 +339,135 @@ public final class PreferentialNetworkServiceConfig implements Parcelable {
		dest.writeIntArray(mExcludedUids);
		}

		private void writeAttributeValueToXml(TypedXmlSerializer out, String tag, int value)
		throws IOException {
		out.startTag(null, tag);
		out.attributeInt(null, ATTR_VALUE, value);
		out.endTag(null, tag);
		}

		private void writeAttributeValueToXml(TypedXmlSerializer out, String tag, boolean value)
		throws IOException {
		out.startTag(null, tag);
		out.attributeBoolean(null, ATTR_VALUE, value);
		out.endTag(null, tag);
		}

		private void writeAttributeValuesToXml(TypedXmlSerializer out, String outerTag, String innerTag,
		@NonNull Collection<String> values) throws IOException {
		out.startTag(null, outerTag);
		for (String value : values) {
		out.startTag(null, innerTag);
		out.attribute(null, ATTR_VALUE, value);
		out.endTag(null, innerTag);
		}
		out.endTag(null, outerTag);
		}

		private static void readAttributeValues(
		TypedXmlPullParser parser, String tag, Collection<String> result)
		throws XmlPullParserException, IOException {
		result.clear();
		int outerDepthDAM = parser.getDepth();
		int typeDAM;
		while ((typeDAM = parser.next()) != END_DOCUMENT
		&& (typeDAM != END_TAG \|\| parser.getDepth() > outerDepthDAM)) {
		if (typeDAM == END_TAG \|\| typeDAM == TEXT) {
		continue;
		}
		String tagDAM = parser.getName();
		if (tag.equals(tagDAM)) {
		result.add(parser.getAttributeValue(null, ATTR_VALUE));
		} else {
		Log.e(LOG_TAG, "Expected tag " + tag + " but found " + tagDAM);
		}
		}
		}

		private List<String> intArrayToStringList(int[] array) {
		return Arrays.stream(array).mapToObj(String::valueOf).collect(Collectors.toList());
		}

		private static int[] readStringListToIntArray(TypedXmlPullParser parser, String tag)
		throws XmlPullParserException, IOException {
		List<String> stringList = new ArrayList<>();
		readAttributeValues(parser, tag, stringList);
		int[] intArray = stringList.stream()
		.map(s -> Integer.parseInt(s))
		.mapToInt(Integer::intValue)
		.toArray();
		return intArray;
		}

		/**
		* @hide
		*/
		public static PreferentialNetworkServiceConfig getPreferentialNetworkServiceConfig(
		TypedXmlPullParser parser, String tag) throws XmlPullParserException, IOException {
		int outerDepthDAM = parser.getDepth();
		int typeDAM;
		PreferentialNetworkServiceConfig.Builder resultBuilder =
		new PreferentialNetworkServiceConfig.Builder();
		while ((typeDAM = parser.next()) != END_DOCUMENT
		&& (typeDAM != END_TAG \|\| parser.getDepth() > outerDepthDAM)) {
		if (typeDAM == END_TAG \|\| typeDAM == TEXT) {
		continue;
		}
		String tagDAM = parser.getName();
		if (TAG_CONFIG_ENABLED.equals(tagDAM)) {
		resultBuilder.setEnabled(parser.getAttributeBoolean(null, ATTR_VALUE,
		DevicePolicyManager.PREFERENTIAL_NETWORK_SERVICE_ENABLED_DEFAULT));
		} else if (TAG_NETWORK_ID.equals(tagDAM)) {
		int val = parser.getAttributeInt(null, ATTR_VALUE, 0);
		if (val != 0) {
		resultBuilder.setNetworkId(val);
		}
		} else if (TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION.equals(tagDAM)) {
		resultBuilder.setFallbackToDefaultConnectionAllowed(parser.getAttributeBoolean(
		null, ATTR_VALUE, true));
		} else if (TAG_INCLUDED_UIDS.equals(tagDAM)) {
		resultBuilder.setIncludedUids(readStringListToIntArray(parser, TAG_UID));
		} else if (TAG_EXCLUDED_UIDS.equals(tagDAM)) {
		resultBuilder.setExcludedUids(readStringListToIntArray(parser, TAG_UID));
		} else {
		Log.w(LOG_TAG, "Unknown tag under " + tag + ": " + tagDAM);
		}
		}
		return resultBuilder.build();
		}

		/**
		* @hide
		*/
		public void writeToXml(@NonNull TypedXmlSerializer out) throws IOException {
		out.startTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG);
		writeAttributeValueToXml(out, TAG_CONFIG_ENABLED, isEnabled());
		writeAttributeValueToXml(out, TAG_NETWORK_ID, getNetworkId());
		writeAttributeValueToXml(out, TAG_ALLOW_FALLBACK_TO_DEFAULT_CONNECTION,
		isFallbackToDefaultConnectionAllowed());
		writeAttributeValuesToXml(out, TAG_INCLUDED_UIDS, TAG_UID,
		intArrayToStringList(getIncludedUids()));
		writeAttributeValuesToXml(out, TAG_EXCLUDED_UIDS, TAG_UID,
		intArrayToStringList(getExcludedUids()));
		out.endTag(null, TAG_PREFERENTIAL_NETWORK_SERVICE_CONFIG);
		}

		/**
		* @hide
		*/
		public void dump(IndentingPrintWriter pw) {
		pw.print("networkId=");
		pw.println(mNetworkId);
		pw.print("isEnabled=");
		pw.println(mIsEnabled);
		pw.print("allowFallbackToDefaultConnection=");
		pw.println(mAllowFallbackToDefaultConnection);
		pw.print("includedUids=");
		pw.println(mIncludedUids);
		pw.print("excludedUids=");
		pw.println(mExcludedUids);
		}

		@Override
		public int describeContents() {
		return 0;

core/java/android/app/smartspace/ISmartspaceManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.content.pm.ParceledListSlice;
		/**
		* @hide
		*/
		interface ISmartspaceManager {
		oneway interface ISmartspaceManager {

		void createSmartspaceSession(in SmartspaceConfig config, in SmartspaceSessionId sessionId,
		in IBinder token);