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

Make DelegateManager thread safe

Browse Source 
We have been seeing crashes on the Theme editor related to an assertion
on getDelegate when the object does not exist
(http://b.android.com/181951).
When debugging, the crash was happening without seeing a previous call
to removeJavaReference. This seems to completely remove that crash.
Since the DelegateManager can be called at least from two threads
(main thread and the finalizer), it should be thread safe.

Bug: http://b.android.com/181951
Change-Id: I1b28f863ff198f8592f170a98f9de391b2ac3ea2
This commit is contained in:
Diego Perez
2015-08-06 14:39:06 +01:00
parent d5a6df6d22
commit 511e48728a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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);
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) {