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

Commit f5377a72 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Useful annotations for code documentation." into jb-mr1.1-dev

parents 7420ab68 8b2c3a14

core/java/android/content/SyncManager.java

+2 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.util.Pair; 
import android.util.Slog;



import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.IndentingPrintWriter;

import com.google.android.collect.Lists;

import com.google.android.collect.Maps;
@@ -155,7 +156,7 @@ public class SyncManager { 


    private SyncStorageEngine mSyncStorageEngine;



    // @GuardedBy("mSyncQueue")

    @GuardedBy("mSyncQueue")

    private final SyncQueue mSyncQueue;



    protected final ArrayList<ActiveSyncContext> mActiveSyncContexts = Lists.newArrayList();

core/java/android/content/SyncStorageEngine.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.content;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastXmlSerializer;
@@ -74,7 +75,7 @@ public class SyncStorageEngine extends Handler { 


    private static final long DEFAULT_POLL_FREQUENCY_SECONDS = 60 * 60 * 24; // One day



    // @VisibleForTesting

    @VisibleForTesting

    static final long MILLIS_IN_4WEEKS = 1000L * 60 * 60 * 24 * 7 * 4;



    /** Enum value for a sync start event. */

core/java/android/content/pm/RegisteredServicesCache.java

+5 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.FastXmlSerializer;

import com.google.android.collect.Lists;

import com.google.android.collect.Maps;
@@ -77,15 +78,15 @@ public abstract class RegisteredServicesCache<V> { 


    private final Object mServicesLock = new Object();



    // @GuardedBy("mServicesLock")

    @GuardedBy("mServicesLock")

    private boolean mPersistentServicesFileDidNotExist;

    // @GuardedBy("mServicesLock")

    @GuardedBy("mServicesLock")

    private final SparseArray<UserServices<V>> mUserServices = new SparseArray<UserServices<V>>();



    private static class UserServices<V> {

        // @GuardedBy("mServicesLock")

        @GuardedBy("mServicesLock")

        public final Map<V, Integer> persistentServices = Maps.newHashMap();

        // @GuardedBy("mServicesLock")

        @GuardedBy("mServicesLock")

        public Map<V, ServiceInfo<V>> services = null;

    }

core/java/android/net/NetworkStats.java

+5 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Parcelable; 
import android.os.SystemClock;

import android.util.SparseBooleanArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.Objects;
@@ -190,14 +191,14 @@ public class NetworkStats implements Parcelable { 
        return clone;

    }



    // @VisibleForTesting

    @VisibleForTesting

    public NetworkStats addIfaceValues(

            String iface, long rxBytes, long rxPackets, long txBytes, long txPackets) {

        return addValues(

                iface, UID_ALL, SET_DEFAULT, TAG_NONE, rxBytes, rxPackets, txBytes, txPackets, 0L);

    }



    // @VisibleForTesting

    @VisibleForTesting

    public NetworkStats addValues(String iface, int uid, int set, int tag, long rxBytes,

            long rxPackets, long txBytes, long txPackets, long operations) {

        return addValues(new Entry(
@@ -269,7 +270,7 @@ public class NetworkStats implements Parcelable { 
        return size;

    }



    // @VisibleForTesting

    @VisibleForTesting

    public int internalSize() {

        return iface.length;

    }
@@ -335,7 +336,7 @@ public class NetworkStats implements Parcelable { 
     * Find first stats index that matches the requested parameters, starting

     * search around the hinted index as an optimization.

     */

    // @VisibleForTesting

    @VisibleForTesting

    public int findIndexHinted(String iface, int uid, int set, int tag, int hintIndex) {

        for (int offset = 0; offset < size; offset++) {

            final int halfOffset = offset / 2;

core/java/android/net/NetworkTemplate.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.res.Resources; 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Objects;



/**
@@ -63,7 +64,7 @@ public class NetworkTemplate implements Parcelable { 


    private static boolean sForceAllNetworkTypes = false;



    // @VisibleForTesting

    @VisibleForTesting

    public static void forceAllNetworkTypes() {

        sForceAllNetworkTypes = true;

    }