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

Commit 4198cece authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Fix the rest of the javadoc warnings." into gingerbread

parents 8946ab26 d3ad696b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ import java.util.concurrent.atomic.AtomicInteger;
public abstract class AbstractThreadedSyncAdapter {
    /**
     * Kernel event log tag.  Also listed in data/etc/event-log-tags.
     * @Deprecated
     * @deprecated Private constant.  May go away in the next release.
     */
    @Deprecated
    public static final int LOG_SYNC_DETAILS = 2743;

    private final Context mContext;
+6 −4
Original line number Diff line number Diff line
@@ -272,13 +272,14 @@ public class ContentProviderOperation implements Parcelable {
     * The ContentValues back references are represented as a ContentValues object where the
     * key refers to a column and the value is an index of the back reference whose
     * valued should be associated with the column.
     * <p>
     * This is intended to be a private method but it is exposed for
     * unit testing purposes
     * @param backRefs an array of previous results
     * @param numBackRefs the number of valid previous results in backRefs
     * @return the ContentValues that should be used in this operation application after
     * expansion of back references. This can be called if either mValues or mValuesBackReferences
     * is null
     * @VisibleForTesting this is intended to be a private method but it is exposed for
     * unit testing purposes
     */
    public ContentValues resolveValueBackReferences(
            ContentProviderResult[] backRefs, int numBackRefs) {
@@ -308,13 +309,14 @@ public class ContentProviderOperation implements Parcelable {
     * the key is an index into the selection argument array (see {@link Builder#withSelection})
     * and the value is the index of the previous result that should be used for that selection
     * argument array slot.
     * <p>
     * This is intended to be a private method but it is exposed for
     * unit testing purposes
     * @param backRefs an array of previous results
     * @param numBackRefs the number of valid previous results in backRefs
     * @return the ContentValues that should be used in this operation application after
     * expansion of back references. This can be called if either mValues or mValuesBackReferences
     * is null
     * @VisibleForTesting this is intended to be a private method but it is exposed for
     * unit testing purposes
     */
    public String[] resolveSelectionArgsBackReferences(
            ContentProviderResult[] backRefs, int numBackRefs) {
+16 −0
Original line number Diff line number Diff line
@@ -19,4 +19,20 @@
@stable
@com.intel.drl.spec_ref
@ar.org.fitc.spec_ref

# Something about CTS?
@cts

# Auto-generated info about the SDK
@sdkCurrent
@sdkCurrentVersion
@sdkCurrentRelId
@sdkPlatformVersion
@sdkPlatformApiLevel
@sdkPlatformMajorMinor
@sdkPlatformReleaseDate
@sdkPlatformDeployableDate
@adtZipVersion
@adtZipDownload
@adtZipBytes
@adtZipChecksum