Merge branch 'froyo' into froyo-release (ef8b7a7c) · Commits · e / os / android_frameworks_base

api/8.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -42126,6 +42126,17 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.touchscreen""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
		type="java.lang.String"
		transient="false"

api/current.xml

+13 −22

Original line number	Diff line number	Diff line
		@@ -45288,6 +45288,17 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.touchscreen""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
		type="java.lang.String"
		transient="false"
		@@ -86123,6 +86134,8 @@
		>
		<parameter name="filePath" type="java.lang.String">
		</parameter>
		<parameter name="kind" type="int">
		</parameter>
		</method>
		<method name="extractThumbnail"
		return="android.graphics.Bitmap"
		@@ -86171,28 +86184,6 @@
		visibility="public"
		>
		</field>
		<field name="TARGET_SIZE_MICRO_THUMBNAIL"
		type="int"
		transient="false"
		volatile="false"
		value="96"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TARGET_SIZE_MINI_THUMBNAIL"
		type="int"
		transient="false"
		volatile="false"
		value="320"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<class name="ToneGenerator"
		extends="java.lang.Object"

core/java/android/bluetooth/BluetoothHeadset.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,17 @@ public final class BluetoothHeadset {
		public static final String EXTRA_AUDIO_STATE =
		"android.bluetooth.headset.extra.AUDIO_STATE";

		/** Extra to be used with the Headset State change intent.
		* This will be used only when Headset state changes to
		* {@link #STATE_DISCONNECTED} from any previous state.
		* This extra field is optional and will be used when
		* we have deterministic information regarding whether
		* the disconnect was initiated by the remote device or
		* by the local adapter.
		*/
		public static final String EXTRA_DISCONNECT_INITIATOR =
		"android.bluetooth.headset.extra.DISCONNECT_INITIATOR";

		/**
		* TODO(API release): Consider incorporating as new state in
		* HEADSET_STATE_CHANGED
		@@ -100,6 +111,11 @@ public final class BluetoothHeadset {
		/** Connection canceled before completetion. */
		public static final int RESULT_CANCELED = 2;

		/** Values for {@link #EXTRA_DISCONNECT_INITIATOR} */
		public static final int REMOTE_DISCONNECT = 0;
		public static final int LOCAL_DISCONNECT = 1;


		/** Default priority for headsets that for which we will accept
		* inconing connections and auto-connect */
		public static final int PRIORITY_AUTO_CONNECT = 1000;

core/java/android/content/pm/PackageManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -736,6 +736,14 @@ public abstract class PackageManager {
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device's display has a touch screen.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";


		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device's touch screen supports

core/java/android/content/pm/PackageParser.java

+36 −7

Original line number	Diff line number	Diff line
		@@ -343,6 +343,9 @@ public class PackageParser {
		} catch (IOException e) {
		Log.w(TAG, "Exception reading " + je.getName() + " in "
		+ jarFile.getName(), e);
		} catch (RuntimeException e) {
		Log.w(TAG, "Exception reading " + je.getName() + " in "
		+ jarFile.getName(), e);
		}
		return null;
		}
		@@ -1212,7 +1215,7 @@ public class PackageParser {
		if (procSeq == null \|\| procSeq.length() <= 0) {
		return defProc;
		}
		return buildCompoundName(pkg, procSeq, "package", outError);
		return buildCompoundName(pkg, procSeq, "process", outError);
		}

		private static String buildTaskAffinityName(String pkg, String defProc,
		@@ -1544,14 +1547,32 @@ public class PackageParser {
		com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);
		ai.permission = (str != null && str.length() > 0) ? str.intern() : null;

		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		str = sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_taskAffinity, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		str = sa.getNonResourceString(
		com.android.internal.R.styleable.AndroidManifestApplication_taskAffinity);
		}
		ai.taskAffinity = buildTaskAffinityName(ai.packageName, ai.packageName,
		str, outError);

		if (outError[0] == null) {
		ai.processName = buildProcessName(ai.packageName, null, sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_process, 0),
		CharSequence pname;
		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		pname = sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_process, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		pname = sa.getNonResourceString(
		com.android.internal.R.styleable.AndroidManifestApplication_process);
		}
		ai.processName = buildProcessName(ai.packageName, null, pname,
		flags, mSeparateProcesses, outError);

		ai.enabled = sa.getBoolean(
		@@ -2796,9 +2817,17 @@ public class PackageParser {
		}

		if (args.processRes != 0) {
		CharSequence pname;
		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		pname = args.sa.getNonConfigurationString(args.processRes, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		pname = args.sa.getNonResourceString(args.processRes);
		}
		outInfo.processName = buildProcessName(owner.applicationInfo.packageName,
		owner.applicationInfo.processName,
		args.sa.getNonConfigurationString(args.processRes, 0),
		owner.applicationInfo.processName, pname,
		args.flags, args.sepProcesses, args.outError);
		}