diff options
| -rw-r--r-- | core/java/android/content/Intent.java | 8 | ||||
| -rwxr-xr-x | core/java/android/provider/ContactsContract.java | 2 | ||||
| -rw-r--r-- | docs/html/distribute/googleplay/spotlight/tablets.jd | 2 | ||||
| -rw-r--r-- | docs/html/google/google_toc.cs | 9 | ||||
| -rw-r--r-- | docs/html/google/play-services/games.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/location/receive-location-updates.jd | 7 |
6 files changed, 23 insertions, 7 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index cf0603e..6a08fbf 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2231,7 +2231,7 @@ public class Intent implements Parcelable, Cloneable { /** * Broadcast Action: An outgoing call is about to be placed. * - * <p>The Intent will have the following extra value: + * <p>The Intent will have the following extra value:</p> * <ul> * <li><em>{@link android.content.Intent#EXTRA_PHONE_NUMBER}</em> - * the phone number originally intended to be dialed.</li> @@ -2250,11 +2250,13 @@ public class Intent implements Parcelable, Cloneable { * should have a positive priority. * Negative priorities are reserved for the system for this broadcast; * using them may cause problems.</p> - * <p>Any BroadcastReceiver receiving this Intent <em>must not</em> - * abort the broadcast.</p> * <p>Emergency calls cannot be intercepted using this mechanism, and * other calls cannot be modified to call emergency numbers using this * mechanism. + * <p>Some apps (such as VoIP apps) may want to redirect the outgoing + * call to use their own service instead. Those apps should first prevent + * the call from being placed by setting resultData to <code>null</code> + * and then start their own app to make the call. * <p>You must hold the * {@link android.Manifest.permission#PROCESS_OUTGOING_CALLS} * permission to receive this Intent.</p> diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 965d38d..e3053be 100755 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -2326,7 +2326,7 @@ public final class ContactsContract { * parameters. The latter approach is preferable, especially when you can reuse the * URI: * <pre> - * Uri rawContactUri = RawContacts.URI.buildUpon() + * Uri rawContactUri = RawContacts.CONTENT_URI.buildUpon() * .appendQueryParameter(RawContacts.ACCOUNT_NAME, accountName) * .appendQueryParameter(RawContacts.ACCOUNT_TYPE, accountType) * .build(); diff --git a/docs/html/distribute/googleplay/spotlight/tablets.jd b/docs/html/distribute/googleplay/spotlight/tablets.jd index 7e1ca43..cfea29a 100644 --- a/docs/html/distribute/googleplay/spotlight/tablets.jd +++ b/docs/html/distribute/googleplay/spotlight/tablets.jd @@ -118,7 +118,7 @@ phone apps serve as great complements to each other."</p> width: 78px; float: left; margin: 12px 20px 30px 20px;" src= - "https://lh5.ggpht.com/mO1TPos65MWJF_n8ZrXMbNCqIqsvN4dQV_rwNOU3pF6N_Ii3lSiCPe_H_MP8C1MK5UKo=w124"> + "https://lh6.ggpht.com/QTy7lOGRTS58NW4XEeym2sxpWKDmRNod_n3kBrHlqTRIyzIv2gkw8DfwiR4GIAdxiHw=w124"> <div style="list-style: none;height:100%; diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs index 00246e2..13d3eb3 100644 --- a/docs/html/google/google_toc.cs +++ b/docs/html/google/google_toc.cs @@ -126,9 +126,18 @@ <li><a href="<?cs var:toroot?>google/gcm/gcm.html"> <span class="en">Architectural Overview</span></a> </li> + <li><a href="<?cs var:toroot?>google/gcm/ccs.html"> + <span class="en">Cloud Connection Server</span></a> + </li> + <li><a href="<?cs var:toroot?>google/gcm/notifications.html"> + <span class="en">User Notifications</span></a> + </li> <li><a href="<?cs var:toroot?>google/gcm/demo.html"> <span class="en">Demo App Tutorial</span></a> </li> + <li><a href="<?cs var:toroot?>google/gcm/helper.html"> + <span class="en">Using the Helper Libraries</span></a> + </li> <li><a href="<?cs var:toroot?>google/gcm/adv.html"> <span class="en">Advanced Topics</span></a> </li> diff --git a/docs/html/google/play-services/games.jd b/docs/html/google/play-services/games.jd index dd07c26..ccd6866 100644 --- a/docs/html/google/play-services/games.jd +++ b/docs/html/google/play-services/games.jd @@ -1,4 +1,4 @@ -page.title=Google Play Games Platform +page.title=Google Play Game Services header.hide=1 @jd:body diff --git a/docs/html/training/location/receive-location-updates.jd b/docs/html/training/location/receive-location-updates.jd index eb4ffa3..c33f075 100644 --- a/docs/html/training/location/receive-location-updates.jd +++ b/docs/html/training/location/receive-location-updates.jd @@ -567,7 +567,12 @@ public class MainActivity extends FragmentActivity implements protected void onStop() { // If the client is connected if (mLocationClient.isConnected()) { - stopPeriodicUpdates(); + /* + * Remove location updates for a listener. + * The current Activity is the listener, so + * the argument is "this". + */ + removeLocationUpdates(this); } /* * After disconnect() is called, the client is |