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

api/current.xml

+33 −0

Original line number	Diff line number	Diff line
		@@ -49064,6 +49064,17 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_NFC"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.nfc""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_ACCELEROMETER"
		type="java.lang.String"
		transient="false"
		@@ -49108,6 +49119,28 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_SIP"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.software.sip""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SIP_VOIP"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.software.sip.voip""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY"
		type="java.lang.String"
		transient="false"

+12 −2

Original line number	Diff line number	Diff line
		@@ -218,8 +218,18 @@ int main(int argc, char *argv[]) {

		/* switch to non-root user and group */
		gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT };
		setgroups(sizeof(groups)/sizeof(groups[0]), groups);
		setuid(AID_SHELL);
		if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
		LOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
		return -1;
		}
		if (setgid(AID_SHELL) != 0) {
		LOGE("Unable to setgid, aborting: %s\n", strerror(errno));
		return -1;
		}
		if (setuid(AID_SHELL) != 0) {
		LOGE("Unable to setuid, aborting: %s\n", strerror(errno));
		return -1;
		}

		char path[PATH_MAX], tmp_path[PATH_MAX];
		pid_t gzip_pid = -1;

+0 −4

Original line number	Diff line number	Diff line
		@@ -837,10 +837,6 @@ public final class ActivityThread {
		}

		private final class H extends Handler {
		private H() {
		SamplingProfiler.getInstance().setEventThread(mLooper.getThread());
		}

		public static final int LAUNCH_ACTIVITY = 100;
		public static final int PAUSE_ACTIVITY = 101;
		public static final int PAUSE_ACTIVITY_FINISHING= 102;

+23 −1

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

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device can communicate using Near-Field
		* Communications (NFC).
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_NFC = "android.hardware.nfc";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device includes a magnetometer (compass).
		@@ -753,6 +761,20 @@ 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 SIP API is enabled on the device.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_SIP = "android.software.sip";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device supports SIP-based VOIP.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device's display has a touch screen.

+10 −2

Original line number	Diff line number	Diff line
		@@ -1048,7 +1048,11 @@ public class WebSettings {
		}

		/**
		* TODO: need to add @Deprecated
		* Set a custom path to plugins used by the WebView. This method is
		* obsolete since each plugin is now loaded from its own package.
		* @param pluginsPath String path to the directory containing plugins.
		* @deprecated This method is no longer used as plugins are loaded from
		* their own APK via the system's package manager.
		*/
		public synchronized void setPluginsPath(String pluginsPath) {
		}
		@@ -1219,7 +1223,11 @@ public class WebSettings {
		}

		/**
		* TODO: need to add @Deprecated
		* Returns the directory that contains the plugin libraries. This method is
		* obsolete since each plugin is now loaded from its own package.
		* @return An empty string.
		* @deprecated This method is no longer used as plugins are loaded from
		* their own APK via the system's package manager.
		*/
		public synchronized String getPluginsPath() {
		return "";