diff options
| author | Katie McCormick <kmccormick@google.com> | 2013-12-02 12:37:58 -0800 |
|---|---|---|
| committer | Katie McCormick <kmccormick@google.com> | 2013-12-02 12:37:58 -0800 |
| commit | d786a1900e94c4f0c919b50b44667cea32fd2939 (patch) | |
| tree | de79d8d23967927e2fcdc944189e0fe6a0b8ddc8 /core/java/android | |
| parent | 866dbc9a73eb18bc47fe2f45c40bbb753b26d27e (diff) | |
| parent | 37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 (diff) | |
resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/PendingIntent.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/SensorManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/ShareActionProvider.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index a03e5b6d3914..29885e7675e7 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -122,8 +122,8 @@ public final class PendingIntent implements Parcelable { public static final int FLAG_ONE_SHOT = 1<<30; /** * Flag for use with {@link #getActivity}, {@link #getBroadcast}, and - * {@link #getService}: if the described PendingIntent does not already - * exist, then simply return null instead of creating it. + * {@link #getService}: if the described PendingIntent already exists, + * then simply return null instead of creating it. */ public static final int FLAG_NO_CREATE = 1<<29; /** diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index b93131308316..8c231296028f 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -1056,8 +1056,8 @@ public abstract class SensorManager { * is mapped. * * @param outR - * the transformed rotation matrix. inR and outR can be the same - * array, but it is not recommended for performance reason. + * the transformed rotation matrix. inR and outR should not be the same + * array. * * @return <code>true</code> on success. <code>false</code> if the input * parameters are incorrect, for instance if X and Y define the same diff --git a/core/java/android/widget/ShareActionProvider.java b/core/java/android/widget/ShareActionProvider.java index 62afd2eef1e1..bdaaa0164ceb 100644 --- a/core/java/android/widget/ShareActionProvider.java +++ b/core/java/android/widget/ShareActionProvider.java @@ -266,7 +266,7 @@ public class ShareActionProvider extends ActionProvider { * Intent shareIntent = new Intent(Intent.ACTION_SEND); * shareIntent.setType("image/*"); * Uri uri = Uri.fromFile(new File(getFilesDir(), "foo.jpg")); - * shareIntent.putExtra(Intent.EXTRA_STREAM, uri.toString());</pre> + * shareIntent.putExtra(Intent.EXTRA_STREAM, uri));</pre> * * @param shareIntent The share intent. * |