Merge "Added JELLY_BEAN version name; update some targetSdkVersion docs." (43ea4e10) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -6822,7 +6822,7 @@ package android.database {
		public abstract interface Cursor {
		method public abstract void close();
		method public abstract void copyStringToBuffer(int, android.database.CharArrayBuffer);
		method public abstract void deactivate();
		method public abstract deprecated void deactivate();
		method public abstract byte[] getBlob(int);
		method public abstract int getColumnCount();
		method public abstract int getColumnIndex(java.lang.String);
		@@ -14427,6 +14427,7 @@ package android.os {
		field public static final int HONEYCOMB_MR2 = 13; // 0xd
		field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
		field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
		field public static final int JELLY_BEAN = 10000; // 0x2710
		}

		public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/app/ActivityThread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3804,7 +3804,7 @@ public final class ActivityThread {
		// implementation to use the pool executor. Normally, we use the
		// serialized executor as the default. This has to happen in the
		// main thread so the main looper is set right.
		if (data.appInfo.targetSdkVersion <= 12) {
		if (data.appInfo.targetSdkVersion <= android.os.Build.VERSION_CODES.HONEYCOMB_MR1) {
		AsyncTask.setDefaultExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
		}

core/java/android/database/Cursor.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -341,6 +341,7 @@ public interface Cursor {
		* Deactivates the Cursor, making all calls on it fail until {@link #requery} is called.
		* Inactive Cursors use fewer resources than active Cursors.
		* Calling {@link #requery} will make the cursor active again.
		* @deprecated Since {@link #requery()} is deprecated, so too is this.
		*/
		void deactivate();

core/java/android/os/Build.java

+62 −3

Original line number	Diff line number	Diff line
		@@ -167,6 +167,8 @@ public class Build {
		* medium density normal size screens unless otherwise indicated).
		* They can still explicitly specify screen support either way with the
		* supports-screens manifest tag.
		* <li> {@link android.widget.TabHost} will use the new dark tab
		* background design.
		* </ul>
		*/
		public static final int DONUT = 4;
		@@ -208,6 +210,13 @@ public class Build {

		/**
		* November 2010: Android 2.3
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		* <li> The application's notification icons will be shown on the new
		* dark status bar background, so must be visible in this situation.
		* </ul>
		*/
		public static final int GINGERBREAD = 9;

		@@ -224,14 +233,34 @@ public class Build {
		* <ul>
		* <li> The default theme for applications is now dark holographic:
		* {@link android.R.style#Theme_Holo}.
		* <li> On large screen devices that do not have a physical menu
		* button, the soft (compatibility) menu is disabled.
		* <li> The activity lifecycle has changed slightly as per
		* {@link android.app.Activity}.
		* <li> An application will crash if it does not call through
		* to the super implementation of its
		* {@link android.app.Activity#onPause Activity.onPause()} method.
		* <li> When an application requires a permission to access one of
		* its components (activity, receiver, service, provider), this
		* permission is no longer enforced when the application wants to
		* access its own component. This means it can require a permission
		* on a component that it does not itself hold and still access that
		* component.
		* <li> {@link android.content.Context#getSharedPreferences
		* Context.getSharedPreferences()} will not automatically reload
		* the preferences if they have changed on storage, unless
		* {@link android.content.Context#MODE_MULTI_PROCESS} is used.
		* <li> {@link android.view.ViewGroup#setMotionEventSplittingEnabled}
		* will default to true.
		* <li> {@link android.view.WindowManager.LayoutParams#FLAG_SPLIT_TOUCH}
		* is enabled by default on windows.
		* <li> {@link android.widget.PopupWindow#isSplitTouchEnabled()
		* PopupWindow.isSplitTouchEnabled()} will return true by default.
		* <li> {@link android.widget.GridView} and {@link android.widget.ListView}
		* will use {@link android.view.View#setActivated View.setActivated}
		* for selected items if they do not implement {@link android.widget.Checkable}.
		* <li> {@link android.widget.Scroller} will be constructed with
		* "flywheel" behavior enabled by default.
		* </ul>
		*/
		public static final int HONEYCOMB = 11;
		@@ -266,13 +295,26 @@ public class Build {
		* preferred over the older screen size buckets and for older devices
		* the appropriate buckets will be inferred from them.</p>
		*
		* <p>New {@link android.content.pm.PackageManager#FEATURE_SCREEN_PORTRAIT}
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		* <li><p>New {@link android.content.pm.PackageManager#FEATURE_SCREEN_PORTRAIT}
		* and {@link android.content.pm.PackageManager#FEATURE_SCREEN_LANDSCAPE}
		* features are introduced in this release. Applications that target
		* features were introduced in this release. Applications that target
		* previous platform versions are assumed to require both portrait and
		* landscape support in the device; when targeting Honeycomb MR1 or
		* greater the application is responsible for specifying any specific
		* orientation it requires.</p>
		* <li><p>{@link android.os.AsyncTask} will use the serial executor
		* by default when calling {@link android.os.AsyncTask#execute}.</p>
		* <li><p>{@link android.content.pm.ActivityInfo#configChanges
		* ActivityInfo.configChanges} will have the
		* {@link android.content.pm.ActivityInfo#CONFIG_SCREEN_SIZE} and
		* {@link android.content.pm.ActivityInfo#CONFIG_SMALLEST_SCREEN_SIZE}
		* bits set; these need to be cleared for older applications because
		* some developers have done absolute comparisons against this value
		* instead of correctly masking the bits they are interested in.
		* </ul>
		*/
		public static final int HONEYCOMB_MR2 = 13;

		@@ -306,14 +348,31 @@ public class Build {
		* <li> The fadingEdge attribute on views will be ignored (fading edges is no
		* longer a standard part of the UI). A new requiresFadingEdge attribute allows
		* applications to still force fading edges on for special cases.
		* <li> {@link android.content.Context#bindService Context.bindService()}
		* will not automatically add in {@link android.content.Context#BIND_WAIVE_PRIORITY}.
		* <li> App Widgets will have standard padding automatically added around
		* them, rather than relying on the padding being baked into the widget itself.
		* <li> An exception will be thrown if you try to change the type of a
		* window after it has been added to the window manager. Previously this
		* would result in random incorrect behavior.
		* <li> {@link android.view.animation.AnimationSet} will parse out
		* the duration, fillBefore, fillAfter, repeatMode, and startOffset
		* XML attributes that are defined.
		* <li> {@link android.app.ActionBar#setHomeButtonEnabled
		* ActionBar.setHomeButtonEnabled()} is false by default.
		* </ul>
		*/
		public static final int ICE_CREAM_SANDWICH = 14;

		/**
		* Android 4.0.3.
		* December 2011: Android 4.0.3.
		*/
		public static final int ICE_CREAM_SANDWICH_MR1 = 15;

		/**
		* Next up on Android!
		*/
		public static final int JELLY_BEAN = CUR_DEVELOPMENT;
		}

		/** The type of build, like "user" or "eng". */