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

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

Merge "Frameworks: Annotate trivial @GuardedBy in services/ misc"

parents ad29fed4 bbab23ff

services/accessibility/java/com/android/server/accessibility/MagnificationController.java

+1 −0
Original line number Diff line number Diff line
@@ -901,6 +901,7 @@ class MagnificationController implements Handler.Callback { 
            }

        }



        @GuardedBy("mLock")

        private void setMagnificationSpecLocked(MagnificationSpec spec) {

            if (mEnabled) {

                if (DEBUG_SET_MAGNIFICATION_SPEC) {

services/backup/java/com/android/server/backup/BackupManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -1931,6 +1931,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { 
    /**

     * Remove a package from the full-data queue.

     */

    @GuardedBy("mQueueLock")

    private void dequeueFullBackupLocked(String packageName) {

        final int N = mFullBackupQueue.size();

        for (int i = N - 1; i >= 0; i--) {

services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ public class DeviceAdminServiceController { 
        }

    }



    @GuardedBy("mLock")

    private void disconnectServiceOnUserLocked(int userId, @NonNull String actionForLog) {

        final DevicePolicyServiceConnection conn = mConnections.get(userId);

        if (conn != null) {

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -10226,6 +10226,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            mInjector.registerContentObserver(mDefaultImeChanged, false, this, UserHandle.USER_ALL);

        }













        @GuardedBy("DevicePolicyManagerService.this")















        private void addPendingChangeByOwnerLocked(int userId) {















            mUserIdsWithPendingChangesByOwner.add(userId);















        }

































services/net/java/android/net/apf/ApfFilter.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -1068,6 +1068,7 @@ public class ApfFilter {













        mLastInstallEvent.flags = ApfProgramEvent.flagsFor(mIPv4Address != null, mMulticastFilter);















    }





























    @GuardedBy("this")















    private void logApfProgramEventLocked(long now) {















        if (mLastInstallEvent == null) {















            return;