Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add an additional lock in the ActivityManagerService" into sc-dev am: 1d84f539e5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb16058116c19aa4b0554d086b61da17171bcd63
This commit is contained in:
Jing Ji
2021-02-04 18:44:22 +00:00
committed by Automerger Merge Worker
parent 60c73c783f 1d84f539e5
commit 57388483af
50 changed files with 7892 additions and 4864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/com/android/internal/annotations/CompositeRWLock.java Normal file
View File

@@ -0,0 +1,47 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.internal.annotations;
import static java.lang.annotation.ElementType.FIELD;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Specifies a list of locks which are required for read/write operations on a data field.
*
* <p>
* To annotate methods accessing the data field with the annotation {@link CompositeRWLock},
* use {@link GuardedBy#value} to annotate method w/ write and/or read access to the data field,
* use {@link GuardedBy#anyOf} to annotate method w/ read only access to the data field.
* </p>
*
* <p>
* When its {@link #value()} consists of multiple locks:
* <ul>
* <li>To write to the protected data, acquire <b>all</b> of the locks
* in the order of the appearance in the {@link #value}.</li>
* <li>To read from the protected data, acquire any of the locks in the {@link #value}.</li>
* </ul>
* </p>
*/
@Target({FIELD})
@Retention(RetentionPolicy.CLASS)
public @interface CompositeRWLock {
String[] value() default {};
}

32
core/java/com/android/internal/annotations/GuardedBy.java
View File

@@ -16,7 +16,9 @@
package com.android.internal.annotations;
import java.lang.annotation.ElementType;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -25,8 +27,32 @@ import java.lang.annotation.Target;
* Annotation type used to mark a method or field that can only be accessed when
* holding the referenced locks.
*/
@Target({ ElementType.FIELD, ElementType.METHOD })
@Target({FIELD, METHOD})
@Retention(RetentionPolicy.CLASS)
public @interface GuardedBy {
String[] value();
/**
* Specifies a list of locks to be held in order to access the field/method
* annotated with this; when used in conjunction with the {@link CompositeRWLock}, locks
* should be acquired in the order of the appearance in the {@link #value} here.
*
* <p>
* If specified, {@link #anyOf()} must be null.
* </p>
*
* @see CompositeRWLock
*/
String[] value() default {};
/**
* Specifies a list of locks where at least one of them must be held in order to access
* the field/method annotated with this; it should be <em>only</em> used in the conjunction
* with the {@link CompositeRWLock}.
*
* <p>
* If specified, {@link #allOf()} must be null.
* </p>
*
* @see CompositeRWLock
*/
String[] anyOf() default {};
}