commit 86321400385172e6bb938d53ce733f1fd7984b20
author Yurii Zubrytskyi <zyy@google.com> Thu Apr 09 19:22:30 2020 -0700
committer Yurii Zubrytskyi <zyy@google.com> Fri Apr 10 13:47:54 2020 -0700
tree bffa46708212f84d6e0e0d2abf5c78c7273cf708
parent da208016d65c331218ed3a1acd2f45d5ca4ce006

[incfs] Fix a crash in worker thread calling JNI

Worker thread has to initialize JNI separately to be able
to call into managed binders implemented in the same
system_server process, e.g. DataLoaderManager

Bug: 153513507
Test: adb install megacity.nov4.apk; adb install megacity.v4.apk
Change-Id: I668e8664361cd2fb3353ec50efd689c7d613658f

services/incremental/BinderIncrementalService.h

diff --git a/services/incremental/BinderIncrementalService.h b/services/incremental/BinderIncrementalService.h
index aca10ab..5a7d5da 100644
--- a/services/incremental/BinderIncrementalService.h
+++ b/services/incremental/BinderIncrementalService.h
@@ -18,6 +18,7 @@
 
 #include <binder/BinderService.h>
 #include <binder/IServiceManager.h>
+#include <jni.h>
 
 #include "IncrementalService.h"
 #include "android/os/incremental/BnIncrementalService.h"
@@ -28,9 +29,9 @@
 class BinderIncrementalService : public BnIncrementalService,
                                  public BinderService<BinderIncrementalService> {
 public:
-    BinderIncrementalService(const sp<IServiceManager>& sm);
+    BinderIncrementalService(const sp<IServiceManager>& sm, JNIEnv* env);
 
-    static BinderIncrementalService* start();
+    static BinderIncrementalService* start(JNIEnv* env);
     static const char16_t* getServiceName() { return u"incremental"; }
     status_t dump(int fd, const Vector<String16>& args) final;