Updated java.lang.ref to Android nougat version

Change on 2017/05/19 by zgao <zgao@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156577627
google · May 24, 2017 · 17668b8 · 17668b8
1 parent 1d1c611
commit 17668b8
Show file tree

Hide file tree

Showing 13 changed files with 867 additions and 667 deletions.
diff --git a/jre_emul/Classes/IOSReference.m b/jre_emul/Classes/IOSReference.m
@@ -312,7 +312,7 @@ static void ReferentSubclassDealloc(id self, SEL _cmd) {
         if ([reference isKindOfClass:[JavaLangRefPhantomReference class]]) {
           phantomRefs[numPhantom++] = reference;
         } else {
-          [reference enqueueInternal];
+          [reference enqueue];
         }
       }
 
@@ -323,7 +323,7 @@ static void ReferentSubclassDealloc(id self, SEL _cmd) {
 
       // Queue all phantom references.
       for (int i = 0; i < numPhantom; i++) {
-        [phantomRefs[i] enqueueInternal];
+        [phantomRefs[i] enqueue];
       }
     }
   });

diff --git a/jre_emul/android/libcore/luni/src/main/java/java/lang/ref/PhantomReference.java b/jre_emul/android/libcore/luni/src/main/java/java/lang/ref/PhantomReference.java
diff --git a/jre_emul/android/libcore/luni/src/main/java/java/lang/ref/Reference.java b/jre_emul/android/libcore/luni/src/main/java/java/lang/ref/Reference.java