Merge branch 'eclair' into eclair-release (b906dbf4) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -35279,6 +35279,17 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_LOCALE_CHANGED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.LOCALE_CHANGED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_MAIN"
		type="java.lang.String"
		transient="false"
		@@ -36125,6 +36136,17 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_CHANGED_COMPONENT_NAME_LIST"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.extra.changed_component_name_list""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="EXTRA_DATA_REMOVED"
		type="java.lang.String"
		transient="false"

core/java/android/app/WallpaperManager.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -195,7 +195,12 @@ public class WallpaperManager {
		if (mDefaultWallpaper != null) {
		return mDefaultWallpaper;
		}
		mWallpaper = null;
		try {
		mWallpaper = getCurrentWallpaperLocked(context);
		} catch (OutOfMemoryError e) {
		Log.w(TAG, "No memory load current wallpaper", e);
		}
		if (mWallpaper == null && returnDefault) {
		mDefaultWallpaper = getDefaultWallpaperLocked(context);
		return mDefaultWallpaper;
		@@ -279,7 +284,12 @@ public class WallpaperManager {
		} catch (IOException e) {
		}

		try {
		return generateBitmap(context, bm, width, height);
		} catch (OutOfMemoryError e) {
		Log.w(TAG, "Can't generate default bitmap", e);
		return bm;
		}
		}
		} catch (RemoteException e) {
		}

core/java/android/content/Intent.java

+30 −7

Original line number	Diff line number	Diff line
		@@ -1275,12 +1275,15 @@ public class Intent implements Parcelable {
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PACKAGE_REMOVED = "android.intent.action.PACKAGE_REMOVED";
		/**
		* Broadcast Action: An existing application package has been changed (e.g. a component has been
		* enabled or disabled. The data contains the name of the package.
		* Broadcast Action: An existing application package has been changed (e.g.
		* a component has been enabled or disabled). The data contains the name of
		* the package.
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid assigned to the package.
		* <li> {@link #EXTRA_CHANGED_COMPONENT_NAME} containing the class name of the changed component.
		* <li> {@link #EXTRA_DONT_KILL_APP} containing boolean field to override the default action of restarting the application.
		* <li> {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST} containing the class name
		* of the changed components.
		* <li> {@link #EXTRA_DONT_KILL_APP} containing boolean field to override the
		* default action of restarting the application.
		* </ul>
		*
		* <p class="note">This is a protected intent that can only be sent
		@@ -1344,6 +1347,12 @@ public class Intent implements Parcelable {
		* can not be restarted will need to watch for this action and handle it
		* appropriately.
		*
		* <p class="note">
		* You can <em>not</em> receive this through components declared
		* in manifests, only by explicitly registering for it with
		* {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)
		* Context.registerReceiver()}.
		*
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		*
		@@ -1351,6 +1360,14 @@ public class Intent implements Parcelable {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED";
		/**
		* Broadcast Action: The current device's locale has changed.
		*
		* <p class="note">This is a protected intent that can only be sent
		* by the system.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_LOCALE_CHANGED = "android.intent.action.LOCALE_CHANGED";
		/**
		* Broadcast Action: This is a <em>sticky broadcast</em> containing the
		* charging state, level, and other information about the battery.
		@@ -2087,13 +2104,19 @@ public class Intent implements Parcelable {
		"android.intent.extra.remote_intent_token";

		/**
		* Used as an int extra field in {@link android.content.Intent#ACTION_PACKAGE_CHANGED}
		* intent to supply the name of the component that changed.
		*
		* @Deprecated See {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST}; this field
		* will contain only the first name in the list.
		*/
		public static final String EXTRA_CHANGED_COMPONENT_NAME =
		"android.intent.extra.changed_component_name";

		/**
		* This field is part of {@link android.content.Intent#ACTION_PACKAGE_CHANGED}
		* and contains a string array of all of the components that have changed.
		*/
		public static final String EXTRA_CHANGED_COMPONENT_NAME_LIST =
		"android.intent.extra.changed_component_name_list";

		/**
		* @hide
		* Magic extra system code can use when binding, to give a label for

core/java/android/content/pm/ActivityInfo.java

+14 −7

Original line number	Diff line number	Diff line
		@@ -309,15 +309,22 @@ public class ActivityInfo extends ComponentInfo

		public void dump(Printer pw, String prefix) {
		super.dumpFront(pw, prefix);
		if (permission != null) {
		pw.println(prefix + "permission=" + permission);
		}
		pw.println(prefix + "taskAffinity=" + taskAffinity
		+ " targetActivity=" + targetActivity);
		if (launchMode != 0 \|\| flags != 0 \|\| theme != 0) {
		pw.println(prefix + "launchMode=" + launchMode
		+ " flags=0x" + Integer.toHexString(flags)
		+ " theme=0x" + Integer.toHexString(theme));
		}
		if (screenOrientation != SCREEN_ORIENTATION_UNSPECIFIED
		\|\| configChanges != 0 \|\| softInputMode != 0) {
		pw.println(prefix + "screenOrientation=" + screenOrientation
		+ " configChanges=0x" + Integer.toHexString(configChanges)
		+ " softInputMode=0x" + Integer.toHexString(softInputMode));
		}
		super.dumpBack(pw, prefix);
		}

core/java/android/content/pm/ApplicationInfo.java

+20 −10

Original line number	Diff line number	Diff line
		@@ -270,21 +270,31 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {

		public void dump(Printer pw, String prefix) {
		super.dumpFront(pw, prefix);
		if (className != null) {
		pw.println(prefix + "className=" + className);
		pw.println(prefix + "permission=" + permission
		+ " uid=" + uid);
		pw.println(prefix + "taskAffinity=" + taskAffinity);
		}
		if (permission != null) {
		pw.println(prefix + "permission=" + permission);
		}
		pw.println(prefix + "uid=" + uid + " taskAffinity=" + taskAffinity);
		if (theme != 0) {
		pw.println(prefix + "theme=0x" + Integer.toHexString(theme));
		}
		pw.println(prefix + "flags=0x" + Integer.toHexString(flags)
		+ " processName=" + processName);
		pw.println(prefix + "sourceDir=" + sourceDir);
		pw.println(prefix + "publicSourceDir=" + publicSourceDir);
		pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);
		pw.println(prefix + "dataDir=" + dataDir);
		pw.println(prefix + "targetSdkVersion=" + targetSdkVersion);
		pw.println(prefix + "enabled=" + enabled);
		if (sharedLibraryFiles != null) {
		pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);
		}
		pw.println(prefix + "enabled=" + enabled + " targetSdkVersion=" + targetSdkVersion);
		if (manageSpaceActivityName != null) {
		pw.println(prefix + "manageSpaceActivityName="+manageSpaceActivityName);
		}
		if (descriptionRes != 0) {
		pw.println(prefix + "description=0x"+Integer.toHexString(descriptionRes));
		}
		super.dumpBack(pw, prefix);
		}