Merge commit 'goog/master' into master_gl (0179ff65) · Commits · e / os / android_frameworks_base

api/current.xml

+24 −2

Original line number	Diff line number	Diff line
		@@ -31485,6 +31485,28 @@
		visibility="public"
		>
		</field>
		<field name="ACTION_POWER_CONNECTED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.POWER_CONNECTED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_POWER_DISCONNECTED"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.intent.action.POWER_DISCONNECTED""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="ACTION_PROVIDER_CHANGED"
		type="java.lang.String"
		transient="false"
		@@ -144083,7 +144105,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -144517,7 +144539,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="use" type="boolean">

core/java/android/content/Intent.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -508,6 +508,8 @@ import java.util.Set;
		* <li> {@link #ACTION_PACKAGE_DATA_CLEARED}
		* <li> {@link #ACTION_UID_REMOVED}
		* <li> {@link #ACTION_BATTERY_CHANGED}
		* <li> {@link #ACTION_POWER_CONNECTED}
		* <li> {@link #ACTION_POWER_DISCONNECTED}
		* </ul>
		*
		* <h3>Standard Categories</h3>
		@@ -1249,6 +1251,25 @@ public class Intent implements Parcelable {
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_BATTERY_LOW = "android.intent.action.BATTERY_LOW";
		/**
		* Broadcast Action: External power has been connected to the device.
		* This is intended for applications that wish to register specifically to this notification.
		* Unlike ACTION_BATTERY_CHANGED, applications will be woken for this and so do not have to
		* stay active to receive this notification. This action can be used to implement actions
		* that wait until power is available to trigger.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_POWER_CONNECTED = "android.intent.action.POWER_CONNECTED";
		/**
		* Broadcast Action: External power has been removed from the device.
		* This is intended for applications that wish to register specifically to this notification.
		* Unlike ACTION_BATTERY_CHANGED, applications will be woken for this and so do not have to
		* stay active to receive this notification. This action can be used to implement actions
		* that wait until power is available to trigger.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_POWER_DISCONNECTED =
		"android.intent.action.POWER_DISCONNECTED";
		/**
		* Broadcast Action: Indicates low memory condition on the device
		*/

core/java/android/content/IntentFilter.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ public class IntentFilter implements Parcelable {
		throws MalformedMimeTypeException {
		mPriority = 0;
		mActions = new ArrayList<String>();
		addAction(action);
		addDataType(dataType);
		}

core/java/android/database/sqlite/SQLiteQueryBuilder.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -351,23 +351,26 @@ public class SQLiteQueryBuilder
		String groupBy, String having, String sortOrder, String limit) {
		String[] projection = computeProjection(projectionIn);

		StringBuilder where = new StringBuilder();

		if (mWhereClause.length() > 0) {
		mWhereClause.append(')');
		where.append(mWhereClause.toString());
		where.append(')');
		}

		// Tack on the user's selection, if present.
		if (selection != null && selection.length() > 0) {
		if (mWhereClause.length() > 0) {
		mWhereClause.append(" AND ");
		where.append(" AND ");
		}

		mWhereClause.append('(');
		mWhereClause.append(selection);
		mWhereClause.append(')');
		where.append('(');
		where.append(selection);
		where.append(')');
		}

		return buildQueryString(
		mDistinct, mTables, projection, mWhereClause.toString(),
		mDistinct, mTables, projection, where.toString(),
		groupBy, having, sortOrder, limit);
		}

core/java/android/provider/Contacts.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1204,7 +1204,7 @@ public class Contacts {
		*/
		public interface OrganizationColumns {
		/**
		* The type of the the phone number.
		* The type of the organizations.
		* <P>Type: INTEGER (one of the constants below)</P>
		*/
		public static final String TYPE = "type";