diff options
25 files changed, 111 insertions, 66 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java index cdd72be76805..5a23fddf1d51 100644 --- a/core/java/android/animation/LayoutTransition.java +++ b/core/java/android/animation/LayoutTransition.java @@ -62,7 +62,11 @@ import java.util.Map; * layout will run (closing the gap created in the layout when the item was removed). If this * default choreography behavior is not desired, the {@link #setDuration(int, long)} and * {@link #setStartDelay(int, long)} of any or all of the animations can be changed as - * appropriate.</p> + * appropriate. Keep in mind, however, that if you start an APPEARING animation before a + * DISAPPEARING animation is completed, the DISAPPEARING animation stops, and any effects from + * the DISAPPEARING animation are reverted. If you instead start a DISAPPEARING animation + * before an APPEARING animation is completed, a similar set of effects occurs for the + * APPEARING animation.</p> * * <p>The animations specified for the transition, both the defaults and any custom animations * set on the transition object, are templates only. That is, these animations exist to hold the diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index f908abcc7ebd..3a2f471e96eb 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1130,7 +1130,9 @@ public abstract class Context { * <strong>Note: you should not <em>rely</em> on the system deleting these * files for you; you should always have a reasonable maximum, such as 1 MB, * for the amount of space you consume with cache files, and prune those - * files when exceeding that space.</strong> + * files when exceeding that space.</strong> If your app requires a larger + * cache (larger than 1 MB), you should use {@link #getExternalCacheDir()} + * instead. * <p> * The returned path may change over time if the calling app is moved to an * adopted storage device, so only relative paths should be persisted. @@ -1142,6 +1144,7 @@ public abstract class Context { * @see #openFileOutput * @see #getFileStreamPath * @see #getDir + * @see #getExternalCacheDir */ public abstract File getCacheDir(); @@ -1190,7 +1193,7 @@ public abstract class Context { * </ul> * <p> * If a shared storage device is emulated (as determined by - * {@link Environment#isExternalStorageEmulated(File)}), it's contents are + * {@link Environment#isExternalStorageEmulated(File)}), its contents are * backed by a private user data partition, which means there is little * benefit to storing data here instead of the private directory returned by * {@link #getCacheDir()}. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 1cf23ae8d040..cf6880a981f4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -128,7 +128,7 @@ import static android.content.ContentProvider.maybeAddUserId; * a list of people, which the user can browse through. This example is a * typical top-level entry into the Contacts application, showing you the * list of people. Selecting a particular person to view would result in a - * new intent { <b>{@link #ACTION_VIEW} <i>content://contacts/N</i></b> } + * new intent { <b>{@link #ACTION_VIEW} <i>content://contacts/people/N</i></b> } * being used to start an activity to display that person.</p> * </li> * </ul> diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index d07b54573547..f5a79c8c13eb 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -124,7 +124,7 @@ import java.util.Set; * <em>Note that authority matching here is <b>case sensitive</b>, unlike * formal RFC host names!</em> You should thus always use lower case letters * for your authority. - * + * * <p><strong>Data Path</strong> matches if any of the given values match the * Intent's data path <em>and</em> both a scheme and authority in the filter * has matched against the Intent, <em>or</em> no paths were supplied in the @@ -359,8 +359,8 @@ public class IntentFilter implements Parcelable { * the {@link MalformedMimeTypeException} exception that the constructor * can call and turns it into a runtime exception. * - * @param action The action to match, i.e. Intent.ACTION_VIEW. - * @param dataType The type to match, i.e. "vnd.android.cursor.dir/person". + * @param action The action to match, such as Intent.ACTION_VIEW. + * @param dataType The type to match, such as "vnd.android.cursor.dir/person". * * @return A new IntentFilter for the given action and type. * @@ -387,7 +387,7 @@ public class IntentFilter implements Parcelable { * no data characteristics are subsequently specified, then the * filter will only match intents that contain no data. * - * @param action The action to match, i.e. Intent.ACTION_MAIN. + * @param action The action to match, such as Intent.ACTION_MAIN. */ public IntentFilter(String action) { mPriority = 0; @@ -407,8 +407,8 @@ public class IntentFilter implements Parcelable { * <p>Throws {@link MalformedMimeTypeException} if the given MIME type is * not syntactically correct. * - * @param action The action to match, i.e. Intent.ACTION_VIEW. - * @param dataType The type to match, i.e. "vnd.android.cursor.dir/person". + * @param action The action to match, such as Intent.ACTION_VIEW. + * @param dataType The type to match, such as "vnd.android.cursor.dir/person". * */ public IntentFilter(String action, String dataType) @@ -652,7 +652,7 @@ public class IntentFilter implements Parcelable { * in the filter, then an Intent's action must be one of those values for * it to match. If no actions are included, the Intent action is ignored. * - * @param action Name of the action to match, i.e. Intent.ACTION_VIEW. + * @param action Name of the action to match, such as Intent.ACTION_VIEW. */ public final void addAction(String action) { if (!mActions.contains(action)) { @@ -721,7 +721,7 @@ public class IntentFilter implements Parcelable { * <p>Throws {@link MalformedMimeTypeException} if the given MIME type is * not syntactically correct. * - * @param type Name of the data type to match, i.e. "vnd.android.cursor.dir/person". + * @param type Name of the data type to match, such as "vnd.android.cursor.dir/person". * * @see #matchData */ @@ -798,7 +798,7 @@ public class IntentFilter implements Parcelable { * and any schemes you receive from outside of Android should be * converted to lower case before supplying them here.</em></p> * - * @param scheme Name of the scheme to match, i.e. "http". + * @param scheme Name of the scheme to match, such as "http". * * @see #matchData */ @@ -909,7 +909,7 @@ public class IntentFilter implements Parcelable { * Determine whether this AuthorityEntry matches the given data Uri. * <em>Note that this comparison is case-sensitive, unlike formal * RFC host names. You thus should always normalize to lower-case.</em> - * + * * @param data The Uri to match. * @return Returns either {@link IntentFilter#NO_MATCH_DATA}, * {@link IntentFilter#MATCH_CATEGORY_PORT}, or @@ -1364,7 +1364,7 @@ public class IntentFilter implements Parcelable { * filter has no impact on matching unless that category is specified in * the intent. * - * @param category Name of category to match, i.e. Intent.CATEGORY_EMBED. + * @param category Name of category to match, such as Intent.CATEGORY_EMBED. */ public final void addCategory(String category) { if (mCategories == null) mCategories = new ArrayList<String>(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 281d6f691bc2..a75f11167721 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -5431,7 +5431,7 @@ public abstract class PackageManager { * {@link #COMPONENT_ENABLED_STATE_DISABLED}, or * {@link #COMPONENT_ENABLED_STATE_DEFAULT}. The last one means the * application's enabled state is based on the original information in - * the manifest as found in {@link ComponentInfo}. + * the manifest as found in {@link ApplicationInfo}. * @throws IllegalArgumentException if the named package does not exist. */ public abstract int getApplicationEnabledSetting(String packageName); diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 990d55374a64..b73acdaf6d8b 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1289,8 +1289,9 @@ public class KeyEvent extends InputEvent implements Parcelable { boolean onKeyUp(int keyCode, KeyEvent event); /** - * Called when multiple down/up pairs of the same key have occurred - * in a row. + * Called when a user's interaction with an analog control, such as + * flinging a trackball, generates simulated down/up events for the same + * key multiple times in quick succession. * * @param keyCode The value in event.getKeyCode(). * @param count Number of pairs as returned by event.getRepeatCount(). diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index aa67c8215b04..d9cb269d8e6f 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -1441,7 +1441,9 @@ public class ImageView extends View { /** * Returns the alpha that will be applied to the drawable of this ImageView. * - * @return the alpha that will be applied to the drawable of this ImageView + * @return the alpha value that will be applied to the drawable of this + * ImageView (between 0 and 255 inclusive, with 0 being transparent and + * 255 being opaque) * * @see #setImageAlpha(int) */ @@ -1452,7 +1454,8 @@ public class ImageView extends View { /** * Sets the alpha value that should be applied to the image. * - * @param alpha the alpha value that should be applied to the image + * @param alpha the alpha value that should be applied to the image (between + * 0 and 255 inclusive, with 0 being transparent and 255 being opaque) * * @see #getImageAlpha() */ diff --git a/docs/html/distribute/tools/promote/brand.jd b/docs/html/distribute/tools/promote/brand.jd index 409dfdda2756..ba2bed7d7059 100644 --- a/docs/html/distribute/tools/promote/brand.jd +++ b/docs/html/distribute/tools/promote/brand.jd @@ -34,30 +34,31 @@ marketing for review.</p> <ul> <li>Android™ should have a trademark symbol the first time it appears in a creative.</li> <li>Android should always be capitalized and is never plural or possessive.</li> - <li>"Android" cannot be used in names of applications or accessory products, - including phones, tablets, TVs, speakers, headphones, watches, and other devices. Instead use "for Android". + <li>"Android", or anything confusingly similar to "Android", cannot be used + in names of applications or accessory products, including phones, tablets, TVs, + speakers, headphones, watches, and other devices. Instead, use "for Android". <ul> - <li><span style="color:red">Incorrect</span>: "Android MediaPlayer"</li> + <li><span style="color:red">Incorrect</span>: "Android MediaPlayer" or "Ndroid MediaPlayer"</li> <li><span style="color:green">Correct</span>: "MediaPlayer for Android"</li> </ul> - <p>If used with your logo, "for Android" should be no larger than 90% of your logo’s size. - First instance of this use should be followed by a TM symbol, "for Android™".</p> + <p>If used with your logo, "for Android" should be no larger than 90% of your logo's size. + The first instance of this use should be followed by a TM symbol: "for Android™".</p> </li> - <li>"Android TV", "Android Wear" and "Android Auto" may only be used to identify or market + <li>"Android TV", "Android Wear", and "Android Auto" may only be used to identify or market products or services with prior approval. Use "for Android" or "with Android" for all - other Android-based products + other Android-based products. <ul> <li><span style="color:red">Incorrect</span>: "Android TV Streaming Stick", "Streaming Stick with Android TV"</li> <li><span style="color:green">Correct</span>: "Streaming Stick with Android"</li> </ul> <p>If used with your logo, "for Android" or "with Android" should be no larger than 90% of - your logo’s size. First instance of this use should be followed by a TM symbol, + your logo's size. The first instance of this use should be followed by a TM symbol: "for Android™".</p> </li> - <li>Android may be used as a descriptor, as long as it is followed by a - proper generic term. (Think of "Android" as a term used in place of - "the Android platform.") + <li>Android may be used as a descriptor in text, as long as it is followed by a + proper generic term and is not the name of your product, app, or service. + Think of "Android" as a term used in place of "the Android platform." <ul> <li><span style="color:red">Incorrect</span>: "Android MediaPlayer" or "Android XYZ app"</li> <li><span style="color:green">Correct</span>: "Android features" or "Android applications"</li> @@ -100,7 +101,9 @@ used according to terms described in the Creative Commons 3.0 Attribution Licens <h4 style="clear:right">Android logo</h4> <div style="float:right;width:210px;margin-left:30px;margin-top:-10px"> - <img alt="" src="{@docRoot}images/brand/android_logo_no.png"> + <img alt="" src="{@docRoot}images/brand/android_logo_no.png" + srcset="{@docRoot}images/brand/android_logo_no.png 1x, + {@docRoot}images/brand/android_logo_no_2x.png 2x"> </div> <p>The Android logo may not be used.</p> diff --git a/docs/html/distribute/users/build-buzz.jd b/docs/html/distribute/users/build-buzz.jd index 7bc6f6c1859e..65aa44ae7656 100644 --- a/docs/html/distribute/users/build-buzz.jd +++ b/docs/html/distribute/users/build-buzz.jd @@ -28,9 +28,6 @@ page.tags="users, growth, promotion" Link to Your Apps in Google Play </h2> - -</div> - <p> After publishing your apps, you can take Android users directly to your app/games detail page on Google Play by <a href= @@ -64,9 +61,6 @@ page.tags="users, growth, promotion" Use the Google Play Badge </h2> - -</div> - <div class="figure" style="margin:0 3em;"> <img src="{@docRoot}images/gp-build-buzz-uplift-1.png"> </div> diff --git a/docs/html/google/play/filters.jd b/docs/html/google/play/filters.jd index 50cc80792641..a73b17f17fe2 100644 --- a/docs/html/google/play/filters.jd +++ b/docs/html/google/play/filters.jd @@ -382,9 +382,12 @@ characteristics that affect filtering on Google Play.</p> suspended, users will not be able to reinstall or update it, even if it appears in their Downloads.</p> </td></tr> <tr> <td valign="top">Priced - Status</td> <td valign="top"><p>Not all users can see paid apps. To show paid apps, a device -must have a SIM card and be running Android 1.1 or later, and it must be in a -country (as determined by SIM carrier) in which paid apps are available.</p></td> + Status</td> <td valign="top"><p>Not all users can see paid apps. To show + paid apps, a device must be running Android 1.1 or later, and it must be in + a country where paid apps are available. If a device has a SIM card, the SIM + carrier determines whether paid apps are available. If a device doesn't have + a SIM card, the device's IP address is used to determine whether the device + is in a country where paid apps are available.</p></td> </tr> <tr> <td valign="top">Country Targeting</td> <td valign="top"> <p>When you upload your app to Google Play, you can select the countries in which to distribute your app diff --git a/docs/html/guide/components/intents-common.jd b/docs/html/guide/components/intents-common.jd index e6c9fc691cbb..47174d2ea9d4 100644 --- a/docs/html/guide/components/intents-common.jd +++ b/docs/html/guide/components/intents-common.jd @@ -2155,7 +2155,7 @@ that are available.</p> <p><b>Example intent:</b></p> <pre> public void openWifiSettings() { - Intent intent = new Intent(Intent.ACTION_WIFI_SETTINGS); + Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS); if (intent.resolveActivity(getPackageManager()) != null) { startActivity(intent); } diff --git a/docs/html/guide/topics/connectivity/nfc/nfc.jd b/docs/html/guide/topics/connectivity/nfc/nfc.jd index 520f52017097..881a75f2512d 100644 --- a/docs/html/guide/topics/connectivity/nfc/nfc.jd +++ b/docs/html/guide/topics/connectivity/nfc/nfc.jd @@ -487,19 +487,22 @@ intent. The following example checks for the {@link android.nfc.NfcAdapter#ACTIO intent and gets the NDEF messages from an intent extra.</p> <pre> -public void onResume() { - super.onResume(); +@Override +protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); ... - if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) { - Parcelable[] rawMsgs = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES); - if (rawMsgs != null) { - msgs = new NdefMessage[rawMsgs.length]; - for (int i = 0; i < rawMsgs.length; i++) { - msgs[i] = (NdefMessage) rawMsgs[i]; + if (intent != null && NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intent.getAction())) { + Parcelable[] rawMessages = + intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES); + if (rawMessages != null) { + NdefMessage[] messages = new NdefMessage[rawMessages.length]; + for (int i = 0; i < rawMessages.length; i++) { + messages[i] = (NdefMessage) rawMessages[i]; } + // Process the messages array. + ... } } - //process the msgs array } </pre> diff --git a/docs/html/guide/topics/providers/content-provider-creating.jd b/docs/html/guide/topics/providers/content-provider-creating.jd index ec6909c89136..59dc108e3b36 100755 --- a/docs/html/guide/topics/providers/content-provider-creating.jd +++ b/docs/html/guide/topics/providers/content-provider-creating.jd @@ -460,7 +460,7 @@ public class ExampleProvider extends ContentProvider { * present. Get the last path segment from the URI; this is the _ID value. * Then, append the value to the WHERE clause for the query */ - selection = selection + "_ID = " uri.getLastPathSegment(); + selection = selection + "_ID = " + uri.getLastPathSegment(); break; default: diff --git a/docs/html/images/brand/android_logo_no.png b/docs/html/images/brand/android_logo_no.png Binary files differindex 8de22d87d9a2..946bc49a4c78 100644 --- a/docs/html/images/brand/android_logo_no.png +++ b/docs/html/images/brand/android_logo_no.png diff --git a/docs/html/images/brand/android_logo_no_2x.png b/docs/html/images/brand/android_logo_no_2x.png Binary files differnew file mode 100644 index 000000000000..8434c795ab79 --- /dev/null +++ b/docs/html/images/brand/android_logo_no_2x.png diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js index e4bd36856c9f..f76cf363f08b 100644 --- a/docs/html/jd_extras_en.js +++ b/docs/html/jd_extras_en.js @@ -1032,6 +1032,17 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "type":"distribute" }, { + "title": "Play Games Quality", + "category": "google", + "summary": "Meet the basic expectations of game players through compelling features and an intuitive, well-designed UI.", + "url": "https://developers.google.com/games/services/checklist", + "group": "", + "keywords": ["games", "play games", "quality"], + "tags": [], + "image": "images/cards/distribute/engage/card-game-services.png", + "type": "distribute" + }, + { "title":"Get Started with Analytics", "category":"google", "summary":"Get advanced insight into how players discover and play your games.", @@ -2979,7 +2990,7 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "timestamp": 1383243492000, "image": "images/cards/google-search_2x.png", "title": "Set Up App Indexing", - "summary": "Surface your app content in Google seaerch. Deep link direct to your apps.", + "summary": "Surface your app content in Google search. Deep link direct to your apps.", "keywords": ["search", "appindexing", "engagement", "getusers"], "type": "distribute", "category": "google" @@ -4376,6 +4387,7 @@ METADATA['en'].collections = { "distribute/essentials/quality/wear.html", "distribute/essentials/quality/tv.html", "distribute/essentials/quality/auto.html", + "https://developers.google.com/games/services/checklist", "distribute/essentials/quality/billions.html", "https://developers.google.com/edu/guidelines" ] diff --git a/docs/html/training/accessibility/service.jd b/docs/html/training/accessibility/service.jd index 9935c97ba61f..c03414516105 100755 --- a/docs/html/training/accessibility/service.jd +++ b/docs/html/training/accessibility/service.jd @@ -17,7 +17,7 @@ previous.link=accessible-app.html <li><a href="#create">Create Your Accessibility Service</a></li> <li><a href="#configure">Configure Your Accessibility Service</a></li> <li><a href="#events">Respond to AccessibilityEvents</a></li> - <li><a href="#query">Query the View Heirarchy for More Context</a></li> + <li><a href="#query">Query the View Hierarchy for More Context</a></li> </ol> <h2>You should also read</h2> @@ -200,7 +200,7 @@ public void onAccessibilityEvent(AccessibilityEvent event) { } </pre> -<h2 id="query">Query the View Heirarchy for More Context</h2> +<h2 id="query">Query the View Hierarchy for More Context</h2> <p>This step is optional, but highly useful. The Android platform provides the ability for an {@link android.accessibilityservice.AccessibilityService} to query the view hierarchy, collecting information about the UI component that generated an event, and diff --git a/docs/html/training/camera/videobasics.jd b/docs/html/training/camera/videobasics.jd index 6da239a33031..b20cfefdf350 100644 --- a/docs/html/training/camera/videobasics.jd +++ b/docs/html/training/camera/videobasics.jd @@ -108,7 +108,7 @@ retrieves this video and displays it in a {@link android.widget.VideoView}.</p> <pre> @Override -protected void onActivityResult(int requestCode, int resultCode, Intent data) { +protected void onActivityResult(int requestCode, int resultCode, Intent intent) { if (requestCode == REQUEST_VIDEO_CAPTURE && resultCode == RESULT_OK) { Uri videoUri = intent.getData(); mVideoView.setVideoURI(videoUri); diff --git a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd index 2dd904f325f7..c63822bea116 100644 --- a/docs/html/training/monitoring-device-state/connectivity-monitoring.jd +++ b/docs/html/training/monitoring-device-state/connectivity-monitoring.jd @@ -33,7 +33,7 @@ next.link=manifest-receivers.html <p>Some of the most common uses for repeating alarms and background services is to schedule regular updates of application data from Internet resources, cache data, or execute long running downloads. But if you aren't connected to the Internet, or the connection is too slow to complete your -download, why both waking the device to schedule the update at all?</p> +download, why bother waking the device to schedule the update at all?</p> <p>You can use the {@link android.net.ConnectivityManager} to check that you're actually connected to the Internet, and if so, what type of connection is in place.</p> diff --git a/docs/html/training/volley/index.jd b/docs/html/training/volley/index.jd index a8c4b84c7c47..d3645d9c8992 100755 --- a/docs/html/training/volley/index.jd +++ b/docs/html/training/volley/index.jd @@ -42,7 +42,7 @@ faster. Volley is available through the open <li>Automatic scheduling of network requests.</li> <li>Multiple concurrent network connections.</li> <li>Transparent disk and memory response caching with standard HTTP -<a href=http://en.wikipedia.org/wiki/Cache_coherence">cache coherence</a>.</li> +<a href="http://en.wikipedia.org/wiki/Cache_coherence">cache coherence</a>.</li> <li>Support for request prioritization.</li> <li>Cancellation request API. You can cancel a single request, or you can set blocks or scopes of requests to cancel.</li> @@ -66,13 +66,22 @@ alternative like {@link android.app.DownloadManager}.</p> <a href="https://android.googlesource.com/platform/frameworks/volley">AOSP</a> repository at {@code frameworks/volley} and contains the main request dispatch pipeline as well as a set of commonly applicable utilities, available in the Volley "toolbox." The -easiest way to add Volley to your project is to clone the Volley repository and set it as -a library project:</p> +easiest way to add Volley to your project is to add the following dependency to your app's +build.gradle file: + +<pre class="no-pretty-print"> +dependencies { + ... + compile 'com.android.volley:volley:1.0.0' +} +</pre> + +You can also clone the Volley repository and set it as a library project:</p> <ol> <li>Git clone the repository by typing the following at the command line: -<pre> +<pre class="no-pretty-print"> git clone https://android.googlesource.com/platform/frameworks/volley </pre> </li> diff --git a/docs/image_sources/brand/android_logo_no.graffle/data.plist b/docs/image_sources/brand/android_logo_no.graffle/data.plist Binary files differnew file mode 100644 index 000000000000..1132a5977241 --- /dev/null +++ b/docs/image_sources/brand/android_logo_no.graffle/data.plist diff --git a/docs/image_sources/brand/android_logo_no.graffle/image1.jpg b/docs/image_sources/brand/android_logo_no.graffle/image1.jpg Binary files differnew file mode 100644 index 000000000000..ff2959958de4 --- /dev/null +++ b/docs/image_sources/brand/android_logo_no.graffle/image1.jpg diff --git a/keystore/java/android/security/KeyPairGeneratorSpec.java b/keystore/java/android/security/KeyPairGeneratorSpec.java index d8493175e63f..d023866ca702 100644 --- a/keystore/java/android/security/KeyPairGeneratorSpec.java +++ b/keystore/java/android/security/KeyPairGeneratorSpec.java @@ -251,8 +251,9 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { /** * Builder class for {@link KeyPairGeneratorSpec} objects. * <p> - * This will build a parameter spec for use with the <a href="{@docRoot} - * training/articles/keystore.html">Android KeyStore facility</a>. + * This will build a parameter spec for use with the + * <a href="{@docRoot}training/articles/keystore.html">Android KeyStore + * facility</a>. * <p> * The required fields must be filled in with the builder. * <p> diff --git a/location/java/android/location/Address.java b/location/java/android/location/Address.java index b152f48a3e9e..335ad5ebcde5 100644 --- a/location/java/android/location/Address.java +++ b/location/java/android/location/Address.java @@ -28,7 +28,7 @@ import android.os.Parcelable; /** * A class representing an Address, i.e, a set of Strings describing a location. * - * The addres format is a simplified version of xAL (eXtensible Address Language) + * The address format is a simplified version of xAL (eXtensible Address Language) * http://www.oasis-open.org/committees/ciq/ciq.html#6 */ public class Address implements Parcelable { diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index f5e422df7511..03342548e7df 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -226,6 +226,13 @@ public class DisconnectCause { */ public static final int DATA_LIMIT_REACHED = 55; + /** + * The emergency call was terminated because it was dialed on the wrong SIM slot. + * The call needs to be redialed the other slot. + * {@hide} + */ + public static final int DIALED_ON_WRONG_SLOT = 56; + //********************************************************************************************* // When adding a disconnect type: // 1) Please assign the new type the next id value below. @@ -234,14 +241,14 @@ public class DisconnectCause { // 4) Update toString() with the newly added disconnect type. // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause. // - // NextId: 56 + // NextId: 57 //********************************************************************************************* /** Smallest valid value for call disconnect codes. */ public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED; /** Largest valid value for call disconnect codes. */ - public static final int MAXIMUM_VALID_VALUE = DATA_LIMIT_REACHED; + public static final int MAXIMUM_VALID_VALUE = DIALED_ON_WRONG_SLOT; /** Private constructor to avoid class instantiation. */ private DisconnectCause() { @@ -361,6 +368,8 @@ public class DisconnectCause { return "DATA_DISABLED"; case DATA_LIMIT_REACHED: return "DATA_LIMIT_REACHED"; + case DIALED_ON_WRONG_SLOT: + return "DIALED_ON_WRONG_SLOT"; default: return "INVALID: " + cause; } |
