diff options
| author | 2024-01-30 16:03:59 +0000 | |
|---|---|---|
| committer | 2024-01-30 16:03:59 +0000 | |
| commit | 1f5ce1eb3041fa0e07b3136555de5538ec6f5dbf (patch) | |
| tree | 41d046a8d53f6e7dd798e57005e2a298dc40354c | |
| parent | acbe507668e0d839f3faaff0464250329667fd64 (diff) | |
| parent | 723862007a19ca55bff6952f82e3f6f3e6760bba (diff) | |
Merge "Make threadlocals volatile" into main
| -rw-r--r-- | core/java/android/os/Binder.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/Process.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 05b7827f586f..b7556dfb51af 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -292,7 +292,7 @@ public class Binder implements IBinder { sWarnOnBlockingOnCurrentThread.set(sWarnOnBlocking); } - private static ThreadLocal<SomeArgs> sIdentity$ravenwood; + private static volatile ThreadLocal<SomeArgs> sIdentity$ravenwood; @android.ravenwood.annotation.RavenwoodKeepWholeClass private static class IdentitySupplier implements Supplier<SomeArgs> { diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 1f3a1620a9f2..3e7b6c9d361a 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -844,7 +844,7 @@ public class Process { return "amd64".equals(System.getProperty("os.arch")); } - private static ThreadLocal<SomeArgs> sIdentity$ravenwood; + private static volatile ThreadLocal<SomeArgs> sIdentity$ravenwood; /** @hide */ @android.ravenwood.annotation.RavenwoodKeep |