Snap for 9088299 from bc3406f6383dcdec8fb31884d342f1deea38f45e to tm-qpr1-release (c5684b8b) · Commits · e / os / android_frameworks_base

core/java/android/net/Ikev2VpnProfile.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -483,9 +483,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		final VpnProfile profile = new VpnProfile("" /* Key; value unused by IKEv2VpnProfile(s) */,
		mIsRestrictedToTestNetworks, mExcludeLocalRoutes, mRequiresInternetValidation,
		mIkeTunConnParams);

		profile.server = getServerAddr();
		profile.ipsecIdentifier = getUserIdentity();
		profile.proxy = mProxyInfo;
		profile.isBypassable = mIsBypassable;
		profile.isMetered = mIsMetered;
		@@ -499,6 +496,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		}

		profile.type = mType;
		profile.server = getServerAddr();
		profile.ipsecIdentifier = getUserIdentity();
		profile.setAllowedAlgorithms(mAllowedAlgorithms);
		switch (mType) {
		case TYPE_IKEV2_IPSEC_USER_PASS:

+7 −0

Original line number	Diff line number	Diff line
		@@ -7426,6 +7426,13 @@ public final class Settings {
		public static final String TRUST_AGENTS_INITIALIZED =
		"trust_agents_initialized";

		/**
		* Set to 1 by the system after the list of known trust agents have been initialized.
		* @hide
		*/
		public static final String KNOWN_TRUST_AGENTS_INITIALIZED =
		"known_trust_agents_initialized";

		/**
		* The Logging ID (a unique 64-bit value) as a hex string.
		* Used as a pseudonymous identifier for logging.

+0 −6

Original line number	Diff line number	Diff line
		@@ -83,11 +83,6 @@ public class FeatureFlagUtils {
		public static final String SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE =
		"settings_hide_second_layer_page_navigate_up_button_in_two_pane";

		/** Support Clear Calling feature.
		* @hide
		*/
		public static final String SETTINGS_ENABLE_CLEAR_CALLING = "settings_enable_clear_calling";

		private static final Map<String, String> DEFAULT_FLAGS;

		static {
		@@ -115,7 +110,6 @@ public class FeatureFlagUtils {
		DEFAULT_FLAGS.put(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS, "true");
		DEFAULT_FLAGS.put(SETTINGS_APP_ALLOW_DARK_THEME_ACTIVATION_AT_BEDTIME, "true");
		DEFAULT_FLAGS.put(SETTINGS_HIDE_SECOND_LAYER_PAGE_NAVIGATE_UP_BUTTON_IN_TWO_PANE, "true");
		DEFAULT_FLAGS.put(SETTINGS_ENABLE_CLEAR_CALLING, "false");
		}

		private static final Set<String> PERSISTENT_FLAGS;

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ public final class ViewRootImpl implements ViewParent,
		* @hide
		*/
		public static final boolean LOCAL_LAYOUT =
		SystemProperties.getBoolean("persist.debug.local_layout", false);
		SystemProperties.getBoolean("persist.debug.local_layout", true);

		/**
		* Set this system property to true to force the view hierarchy to render

+4 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,10 @@ public final class TaskFragmentInfo implements Parcelable {
		/**
		* Returns {@code true} if the parameters that are important for task fragment organizers are
		* equal between this {@link TaskFragmentInfo} and {@param that}.
		* Note that this method is usually called with
		* {@link com.android.server.wm.WindowOrganizerController#configurationsAreEqualForOrganizer(
		* Configuration, Configuration)} to determine if this {@link TaskFragmentInfo} should
		* be dispatched to the client.
		*/
		public boolean equalsForTaskFragmentOrganizer(@Nullable TaskFragmentInfo that) {
		if (that == null) {