auto import from //branches/cupcake_rel/...@140373
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 90ff78a..306c02e 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1035,7 +1035,7 @@
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_SEARCH_LONG_PRESS = "android.intent.action.SEARCH_LONG_PRESS";
-
+
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
// Standard intent broadcast actions (see action variable).
@@ -1052,7 +1052,7 @@
public static final String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
/**
- * Broadcast Action: Sent when the user is present after device wakes up (e.g when the
+ * Broadcast Action: Sent when the user is present after device wakes up (e.g when the
* keyguard is gone).
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@@ -1210,7 +1210,7 @@
/**
* Broadcast Action: The charging state, or charge level of the battery has
* changed.
- *
+ *
* <p class="note">
* You can <em>not</em> receive this through components declared
* in manifests, only by exlicitly registering for it with
@@ -1380,7 +1380,7 @@
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_GTALK_SERVICE_DISCONNECTED =
"android.intent.action.GTALK_DISCONNECTED";
-
+
/**
* Broadcast Action: An input method has been changed.
* {@hide pending API Council approval}
@@ -1450,12 +1450,12 @@
*
* <p>The Intent will have the following extra value:
* <ul>
- * <li><em>{@link android.content.Intent#EXTRA_PHONE_NUMBER}</em> -
+ * <li><em>{@link android.content.Intent#EXTRA_PHONE_NUMBER}</em> -
* the phone number originally intended to be dialed.</li>
* </ul>
* <p>Once the broadcast is finished, the resultData is used as the actual
* number to call. If <code>null</code>, no call will be placed.</p>
- * <p>It is perfectly acceptable for multiple receivers to process the
+ * <p>It is perfectly acceptable for multiple receivers to process the
* outgoing call in turn: for example, a parental control application
* might verify that the user is authorized to place the call at that
* time, then a number-rewriting application might add an area code if
@@ -1463,7 +1463,7 @@
* <p>For consistency, any receiver whose purpose is to prohibit phone
* calls should have a priority of 0, to ensure it will see the final
* phone number to be dialed.
- * Any receiver whose purpose is to rewrite phone numbers to be called
+ * Any receiver whose purpose is to rewrite phone numbers to be called
* should have a positive priority.
* Negative priorities are reserved for the system for this broadcast;
* using them may cause problems.</p>
@@ -1472,7 +1472,7 @@
* <p>Emergency calls cannot be intercepted using this mechanism, and
* other calls cannot be modified to call emergency numbers using this
* mechanism.
- * <p>You must hold the
+ * <p>You must hold the
* {@link android.Manifest.permission#PROCESS_OUTGOING_CALLS}
* permission to receive this Intent.</p>
*/
@@ -1709,7 +1709,7 @@
* implying that this is an update).
*/
public static final String EXTRA_DATA_REMOVED = "android.intent.extra.DATA_REMOVED";
-
+
/**
* Used as a boolean extra field in {@link android.content.Intent#ACTION_PACKAGE_REMOVED}
* intents to indicate that this is a replacement of the package, so this
@@ -1717,7 +1717,7 @@
* different version of the same package.
*/
public static final String EXTRA_REPLACING = "android.intent.extra.REPLACING";
-
+
/**
* Used as an int extra field in {@link android.app.AlarmManager} intents
* to tell the application being invoked how many pending alarms are being
@@ -1728,15 +1728,6 @@
*/
public static final String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
- /**
- * Used as an int extra field in {@link android.content.Intent#ACTION_VOICE_COMMAND}
- * intents to request which audio route the voice command should prefer.
- * The value should be a route from {@link android.media.AudioManager}, for
- * example ROUTE_BLUETOOTH_SCO. Providing this value is optional.
- * {@hide pending API Council approval}
- */
- public static final String EXTRA_AUDIO_ROUTE = "android.intent.extra.AUDIO_ROUTE";
-
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
// Intent flags (see mFlags variable).
@@ -1781,7 +1772,7 @@
* next task activity) defines an atomic group of activities that the
* user can move to. Tasks can be moved to the foreground and background;
* all of the activities inside of a particular task always remain in
- * the same order. See
+ * the same order. See
* <a href="{@docRoot}guide/topics/fundamentals.html#acttask">Application Fundamentals:
* Activities and Tasks</a> for more details on tasks.
*
@@ -1812,7 +1803,7 @@
* <p><strong>Because the default system does not include graphical task management,
* you should not use this flag unless you provide some way for a user to
* return back to the tasks you have launched.</strong>
- *
+ *
* <p>This flag is ignored if
* {@link #FLAG_ACTIVITY_NEW_TASK} is not set.
*
@@ -1901,7 +1892,7 @@
* the user re-launching it from home), this activity and all on top of
* it will be finished so that the user does not return to them, but
* instead returns to whatever activity preceeded it.
- *
+ *
* <p>This is useful for cases where you have a logical break in your
* application. For example, an e-mail application may have a command
* to view an attachment, which launches an image view activity to
@@ -1919,31 +1910,31 @@
* If set, this flag will prevent the normal {@link android.app.Activity#onUserLeaveHint}
* callback from occurring on the current frontmost activity before it is
* paused as the newly-started activity is brought to the front.
- *
+ *
* <p>Typically, an activity can rely on that callback to indicate that an
* explicit user action has caused their activity to be moved out of the
* foreground. The callback marks an appropriate point in the activity's
* lifecycle for it to dismiss any notifications that it intends to display
* "until the user has seen them," such as a blinking LED.
- *
+ *
* <p>If an activity is ever started via any non-user-driven events such as
* phone-call receipt or an alarm handler, this flag should be passed to {@link
* Context#startActivity Context.startActivity}, ensuring that the pausing
- * activity does not think the user has acknowledged its notification.
+ * activity does not think the user has acknowledged its notification.
*/
public static final int FLAG_ACTIVITY_NO_USER_ACTION = 0x00040000;
/**
* If set in an Intent passed to {@link Context#startActivity Context.startActivity()},
* this flag will cause the launched activity to be brought to the front of its
* task's history stack if it is already running.
- *
+ *
* <p>For example, consider a task consisting of four activities: A, B, C, D.
* If D calls startActivity() with an Intent that resolves to the component
* of activity B, then B will be brought to the front of the history stack,
* with this resulting order: A, C, D, B.
- *
+ *
* This flag will be ignored if {@link #FLAG_ACTIVITY_CLEAR_TOP} is also
- * specified.
+ * specified.
*/
public static final int FLAG_ACTIVITY_REORDER_TO_FRONT = 0X00020000;
/**
@@ -1957,11 +1948,11 @@
* will be launched. Sticky intent state will be recorded properly even
* if no receivers wind up being called. If {@link #FLAG_RECEIVER_REGISTERED_ONLY}
* is specified in the broadcast intent, this flag is unnecessary.
- *
+ *
* <p>This flag is only for use by system sevices as a convenience to
* avoid having to implement a more complex mechanism around detection
* of boot completion.
- *
+ *
* @hide
*/
public static final int FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT = 0x20000000;
@@ -2121,7 +2112,7 @@
// old format Intent URI
if (!uri.startsWith("#Intent;", i)) return getIntentOld(uri);
-
+
// new format
Intent intent = new Intent(ACTION_VIEW);
@@ -2130,7 +2121,7 @@
intent.mData = Uri.parse(uri.substring(0, i));
}
i += "#Intent;".length();
-
+
// loop over contents of Intent, all name=value;
while (!uri.startsWith("end", i)) {
int eq = uri.indexOf('=', i);
@@ -2161,7 +2152,7 @@
else if (uri.startsWith("component=", i)) {
intent.mComponent = ComponentName.unflattenFromString(value);
}
-
+
// extra
else {
String key = Uri.decode(uri.substring(i + 2, eq));
@@ -2181,18 +2172,18 @@
else if (uri.startsWith("s.", i)) b.putShort(key, Short.parseShort(value));
else throw new URISyntaxException(uri, "unknown EXTRA type", i);
}
-
+
// move to the next item
i = semi + 1;
}
return intent;
-
+
} catch (IndexOutOfBoundsException e) {
throw new URISyntaxException(uri, "illegal Intent URI format", i);
}
}
-
+
public static Intent getIntentOld(String uri) throws URISyntaxException {
Intent intent;
@@ -2257,7 +2248,7 @@
if (uri.regionMatches(i, "extras(", 0, 7)) {
i += 7;
-
+
final int closeParen = uri.indexOf(')', i);
if (closeParen == -1) throw new URISyntaxException(uri,
"EXTRA missing trailing ')'", i);
@@ -2272,7 +2263,7 @@
i++;
String key = uri.substring(i, j);
i = j + 1;
-
+
// get type-value
j = uri.indexOf('!', i);
if (j == -1 || j >= closeParen) j = closeParen;
@@ -2282,7 +2273,7 @@
// create Bundle if it doesn't already exist
if (intent.mExtras == null) intent.mExtras = new Bundle();
-
+
// add item to bundle
try {
switch (type) {
@@ -2319,7 +2310,7 @@
} catch (NumberFormatException e) {
throw new URISyntaxException(uri, "EXTRA value can't be parsed", i);
}
-
+
char ch = uri.charAt(i);
if (ch == ')') break;
if (ch != '!') throw new URISyntaxException(uri, "EXTRA missing '!'", i);
@@ -2522,7 +2513,7 @@
public boolean hasFileDescriptors() {
return mExtras != null && mExtras.hasFileDescriptors();
}
-
+
/**
* Retrieve extended data from the intent.
*
@@ -3889,7 +3880,7 @@
/**
* Completely replace the extras in the Intent with the extras in the
* given Intent.
- *
+ *
* @param src The exact extras contained in this Intent are copied
* into the target intent, replacing any that were previously there.
*/
@@ -3897,11 +3888,11 @@
mExtras = src.mExtras != null ? new Bundle(src.mExtras) : null;
return this;
}
-
+
/**
* Completely replace the extras in the Intent with the given Bundle of
* extras.
- *
+ *
* @param extras The new set of extras in the Intent, or null to erase
* all extras.
*/
@@ -3909,7 +3900,7 @@
mExtras = extras != null ? new Bundle(extras) : null;
return this;
}
-
+
/**
* Remove extended data from the intent.
*
@@ -4397,12 +4388,12 @@
}
}
}
-
+
uri.append("end");
return uri.toString();
}
-
+
public int describeContents() {
return (mExtras != null) ? mExtras.describeContents() : 0;
}