Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 484b57a5 authored by Katie McCormick's avatar Katie McCormick Committed by Android Git Automerger
Browse files

am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs

* commit '9d0a88bd':
  Doc updates: Javadoc fixes
parents fdb738a5 9d0a88bd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,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;
    /**
+2 −2
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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.
     *
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.graphics;
import android.util.FloatMath;

/**
 *  5x4 matrix for transforming the color+alpha components of a Bitmap.
 *  4x5 matrix for transforming the color+alpha components of a Bitmap.
 *  The matrix is stored in a single array, and its treated as follows:
 *  [ a, b, c, d, e,
 *    f, g, h, i, j,