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

Commit 40279e54 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I6993325b,Icb5114fe 

* changes:
  Frameworks: Annotate trivial @GuardedBy in services/core
  Frameworks: Annotate trivial @GuardedBy in core/java
parents 6c78b876 a36dc621

core/java/android/app/ContextImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ class ContextImpl extends Context { 
        return sp;

    }



    @GuardedBy("ContextImpl.class")

    private ArrayMap<File, SharedPreferencesImpl> getSharedPreferencesCacheLocked() {

        if (sSharedPrefsCache == null) {

            sSharedPrefsCache = new ArrayMap<>();

core/java/android/content/pm/permission/RuntimePermissionPresenter.java

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ public final class RuntimePermissionPresenter { 
            }

        }



        @GuardedBy("mLock")

        private void scheduleNextMessageIfNeededLocked() {

            if (mBound && mRemoteInstance != null && !mPendingWork.isEmpty()) {

                Message nextMessage = mPendingWork.remove(0);

core/java/android/content/res/AssetManager.java

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ public final class AssetManager implements AutoCloseable { 
    /**

     * This must be called from Zygote so that system assets are shared by all applications.

     */

    @GuardedBy("sSync")

    private static void createSystemAssetsInZygoteLocked() {

        if (sSystem != null) {

            return;
@@ -366,6 +367,7 @@ public final class AssetManager implements AutoCloseable { 
     * The AssetManager may have been closed, but references to it still exist

     * and therefore the native implementation is not destroyed.

     */

    @GuardedBy("this")

    private void ensureValidLocked() {

        if (mObject == 0) {

            throw new RuntimeException("AssetManager has been destroyed");
@@ -376,6 +378,7 @@ public final class AssetManager implements AutoCloseable { 
     * Ensures that the AssetManager has not been explicitly closed. If this method passes,

     * then this implies that ensureValidLocked() also passes.

     */

    @GuardedBy("this")

    private void ensureOpenLocked() {

        // If mOpen is true, this implies that mObject != 0.

        if (!mOpen) {
@@ -1189,6 +1192,7 @@ public final class AssetManager implements AutoCloseable { 
        }

    }



    @GuardedBy("this")

    private void incRefsLocked(long id) {

        if (DEBUG_REFS) {

            if (mRefStacks == null) {
@@ -1201,6 +1205,7 @@ public final class AssetManager implements AutoCloseable { 
        mNumRefs++;

    }



    @GuardedBy("this")

    private void decRefsLocked(long id) {

        if (DEBUG_REFS && mRefStacks != null) {

            mRefStacks.remove(id);

core/java/android/database/sqlite/SQLiteConnectionPool.java

+12 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private boolean recycleConnectionLocked(SQLiteConnection connection,

            AcquiredConnectionStatus status) {

        if (status == AcquiredConnectionStatus.RECONFIGURE) {
@@ -531,6 +532,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void closeAvailableConnectionsAndLogExceptionsLocked() {

        closeAvailableNonPrimaryConnectionsAndLogExceptionsLocked();
@@ -541,6 +543,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private boolean closeAvailableConnectionLocked(int connectionId) {

        final int count = mAvailableNonPrimaryConnections.size();

        for (int i = count - 1; i >= 0; i--) {
@@ -562,6 +565,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void closeAvailableNonPrimaryConnectionsAndLogExceptionsLocked() {

        final int count = mAvailableNonPrimaryConnections.size();

        for (int i = 0; i < count; i++) {
@@ -581,6 +585,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void closeExcessConnectionsAndLogExceptionsLocked() {

        int availableCount = mAvailableNonPrimaryConnections.size();

        while (availableCount-- > mMaxConnectionPoolSize - 1) {
@@ -591,6 +596,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void closeConnectionAndLogExceptionsLocked(SQLiteConnection connection) {

        try {

            connection.close(); // might throw
@@ -609,6 +615,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void reconfigureAllConnectionsLocked() {

        if (mAvailablePrimaryConnection != null) {

            try {
@@ -776,6 +783,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void cancelConnectionWaiterLocked(ConnectionWaiter waiter) {

        if (waiter.mAssignedConnection != null || waiter.mException != null) {

            // Waiter is done waiting but has not woken up yet.
@@ -848,6 +856,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Can't throw.

    @GuardedBy("mLock")

    private void wakeConnectionWaitersLocked() {

        // Unpark all waiters that have requests that we can fulfill.

        // This method is designed to not throw runtime exceptions, although we might send
@@ -910,6 +919,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Might throw.

    @GuardedBy("mLock")

    private SQLiteConnection tryAcquirePrimaryConnectionLocked(int connectionFlags) {

        // If the primary connection is available, acquire it now.

        SQLiteConnection connection = mAvailablePrimaryConnection;
@@ -935,6 +945,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Might throw.

    @GuardedBy("mLock")

    private SQLiteConnection tryAcquireNonPrimaryConnectionLocked(

            String sql, int connectionFlags) {

        // Try to acquire the next connection in the queue.
@@ -974,6 +985,7 @@ public final class SQLiteConnectionPool implements Closeable { 
    }



    // Might throw.

    @GuardedBy("mLock")

    private void finishAcquireConnectionLocked(SQLiteConnection connection, int connectionFlags) {

        try {

            final boolean readOnly = (connectionFlags & CONNECTION_FLAG_READ_ONLY) != 0;

core/java/android/service/notification/NotificationListenerService.java

+1 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,7 @@ public abstract class NotificationListenerService extends Service { 
    /**

     * @hide

     */

    @GuardedBy("mLock")

    public final void applyUpdateLocked(NotificationRankingUpdate update) {

        mRankingMap = new RankingMap(update);

    }