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

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/app)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/content)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

+14 −1

Original line number	Diff line number	Diff line
		@@ -25351,6 +25351,19 @@
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<method name="enableCarMode"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		<method name="getCurrentModeType"
		return="int"
		abstract="false"
		@@ -81445,7 +81458,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="onAudioFocusChanged"
		<method name="onAudioFocusChange"
		return="void"
		abstract="true"
		native="false"

+16 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,22 @@ public class UiModeManager {
		*/
		public static final int DISABLE_CAR_MODE_GO_HOME = 0x0001;

		/**
		* Force device into car mode, like it had been placed in the car dock.
		* This will cause the device to switch to the car home UI as part of
		* the mode switch.
		* @param flags Must be 0.
		*/
		public void enableCarMode(int flags) {
		if (mService != null) {
		try {
		mService.enableCarMode();
		} catch (RemoteException e) {
		Log.e(TAG, "disableCarMode: RemoteException", e);
		}
		}
		}

		/**
		* Turn off special mode if currently in car mode.
		* @param flags May be 0 or {@link #DISABLE_CAR_MODE_GO_HOME}.

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,12 +54,12 @@ public class WebAddress {
		static final int MATCH_GROUP_PATH = 5;

		static Pattern sAddressPattern = Pattern.compile(
		/* scheme */ "(?:(http\|HTTP\|https\|HTTPS\|file\|FILE)\\:\\/\\/)?" +
		/* scheme */ "(?:(http\|https\|file)\\:\\/\\/)?" +
		/* authority / "(?:([-A-Za-z0-9$_.+!'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" +
		/* host / "([-" + GOOD_IRI_CHAR + "%_]+(?:\\.[-" + GOOD_IRI_CHAR + "%_]+)\|\\[[0-9a-fA-F:\\.]+\\])?" +
		/* port / "(?:\\:([0-9]))?" +
		/* path / "(\\/?[^#])?" +
		/* anchor / ".");
		/* anchor / ".", Pattern.CASE_INSENSITIVE);

		/** parses given uriString. */
		public WebAddress(String address) throws ParseException {
		@@ -79,7 +79,7 @@ public class WebAddress {
		String t;
		if (m.matches()) {
		t = m.group(MATCH_GROUP_SCHEME);
		if (t != null) mScheme = t;
		if (t != null) mScheme = t.toLowerCase();
		t = m.group(MATCH_GROUP_AUTHORITY);
		if (t != null) mAuthInfo = t;
		t = m.group(MATCH_GROUP_HOST);

+2 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,8 @@ public class RequestQueue implements RequestFeeder {
		mContext.registerReceiver(mProxyChangeReceiver,
		new IntentFilter(Proxy.PROXY_CHANGE_ACTION));
		}
		// we need to resample the current proxy setup
		setProxyConfig();
		}

		/**