Merge branch 'gingerbread' into gingerbread-release (d85d63e5) · Commits · e / os / android_frameworks_base

api/9.xml

+0 −22

Original line number	Diff line number	Diff line
		@@ -793,17 +793,6 @@
		visibility="public"
		>
		</field>
		<field name="READ_OWNER_DATA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.READ_OWNER_DATA""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="READ_PHONE_STATE"
		type="java.lang.String"
		transient="false"
		@@ -1233,17 +1222,6 @@
		visibility="public"
		>
		</field>
		<field name="WRITE_OWNER_DATA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.WRITE_OWNER_DATA""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WRITE_SECURE_SETTINGS"
		type="java.lang.String"
		transient="false"

api/current.xml

+8 −30

Original line number	Diff line number	Diff line
		@@ -712,7 +712,7 @@
		value=""android.permission.PERSISTENT_ACTIVITY""
		static="true"
		final="true"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		@@ -793,17 +793,6 @@
		visibility="public"
		>
		</field>
		<field name="READ_OWNER_DATA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.READ_OWNER_DATA""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="READ_PHONE_STATE"
		type="java.lang.String"
		transient="false"
		@@ -1233,17 +1222,6 @@
		visibility="public"
		>
		</field>
		<field name="WRITE_OWNER_DATA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.permission.WRITE_OWNER_DATA""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WRITE_SECURE_SETTINGS"
		type="java.lang.String"
		transient="false"
		@@ -20516,7 +20494,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="isPersistent" type="boolean">
		@@ -203586,7 +203564,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -204134,7 +204112,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="pluginsPath" type="java.lang.String">
		@@ -252670,7 +252648,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="lng" type="long">
		<parameter name="l" type="long">
		</parameter>
		</method>
		<method name="append"
		@@ -252748,7 +252726,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="ch" type="char[]">
		<parameter name="chars" type="char[]">
		</parameter>
		</method>
		<method name="append"
		@@ -307319,9 +307297,9 @@
		>
		<parameter name="number" type="java.lang.Object">
		</parameter>
		<parameter name="toAppendTo" type="java.lang.StringBuffer">
		<parameter name="buffer" type="java.lang.StringBuffer">
		</parameter>
		<parameter name="pos" type="java.text.FieldPosition">
		<parameter name="position" type="java.text.FieldPosition">
		</parameter>
		</method>
		<method name="getDecimalFormatSymbols"

core/java/android/app/Activity.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1620,6 +1620,9 @@ public class Activity extends ContextThemeWrapper
		}

		/**
		* @deprecated This functionality will be removed in the future; please do
		* not use.
		*
		* Control whether this activity is required to be persistent. By default
		* activities are not persistent; setting this to true will prevent the
		* system from stopping this activity or its process when running low on
		@@ -1634,6 +1637,7 @@ public class Activity extends ContextThemeWrapper
		* persistent, true if so, false for the normal
		* behavior.
		*/
		@Deprecated
		public void setPersistent(boolean isPersistent) {
		if (mParent == null) {
		try {

core/java/android/view/ViewConfiguration.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -143,12 +143,12 @@ public class ViewConfiguration {
		/**
		* Max distance to overscroll for edge effects
		*/
		private static final int OVERSCROLL_DISTANCE = 4;
		private static final int OVERSCROLL_DISTANCE = 2;

		/**
		* Max distance to overfling for edge effects
		*/
		private static final int OVERFLING_DISTANCE = 8;
		private static final int OVERFLING_DISTANCE = 4;

		private final int mEdgeSlop;
		private final int mFadingEdgeLength;

core/java/android/webkit/WebSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1054,6 +1054,7 @@ public class WebSettings {
		* @deprecated This method is no longer used as plugins are loaded from
		* their own APK via the system's package manager.
		*/
		@Deprecated
		public synchronized void setPluginsPath(String pluginsPath) {
		}

		@@ -1229,6 +1230,7 @@ public class WebSettings {
		* @deprecated This method is no longer used as plugins are loaded from
		* their own APK via the system's package manager.
		*/
		@Deprecated
		public synchronized String getPluginsPath() {
		return "";
		}