drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am af8c19e7: am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev

Browse Source 
* commit 'af8c19e770717b209ca0c0cf0549eaeff8f1c78e':
  Make DelegateManager thread safe
This commit is contained in:
Diego Perez
2015-08-11 20:56:01 +00:00
committed by Android Git Automerger
parent f3d04cbfe6 af8c19e770
commit 83ec22a882
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/DelegateManager.java
View File

@ -97,13 +97,13 @@ public final class DelegateManager<T> {
* @return the delegate or null if not found.
*/
@Nullable
public T getDelegate(long native_object) {
public synchronized T getDelegate(long native_object) {
if (native_object > 0) {
T delegate = mDelegates.get(native_object);
if (Debug.DEBUG) {
if (delegate == null) {
System.out.println("Unknown " + mClass.getSimpleName() + " with int " +
System.err.println("Unknown " + mClass.getSimpleName() + " with int " +
native_object);
}
}
@ -119,14 +119,18 @@ public final class DelegateManager<T> {
* @param newDelegate the delegate to add
* @return a unique native int to identify the delegate
*/
public long addNewDelegate(T newDelegate) {
public synchronized long addNewDelegate(T newDelegate) {
long native_object = ++mDelegateCounter;
mDelegates.put(native_object, newDelegate);
assert !mJavaReferences.contains(newDelegate);
mJavaReferences.add(newDelegate);
if (Debug.DEBUG) {
System.out.println("New " + mClass.getSimpleName() + " with int " + native_object);
System.out.println(
"New " + mClass.getSimpleName() + " " +
"with int " +
native_object);
}
return native_object;
@ -136,7 +140,7 @@ public final class DelegateManager<T> {
* Removes the main reference on the given delegate.
* @param native_object the native integer representing the delegate.
*/
public void removeJavaReferenceFor(long native_object) {
public synchronized void removeJavaReferenceFor(long native_object) {
T delegate = getDelegate(native_object);
if (Debug.DEBUG) {