Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5ce1eb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Make threadlocals volatile" into main

parents acbe5076 72386200

core/java/android/os/Binder.java

+1 −1
Original line number Diff line number Diff line
@@ -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> {

core/java/android/os/Process.java

+1 −1
Original line number Diff line number Diff line
@@ -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