diff options
author | Yurii Zubrytskyi <zyy@google.com> | 2020-04-09 19:22:30 -0700 |
---|---|---|
committer | Yurii Zubrytskyi <zyy@google.com> | 2020-04-10 13:47:54 -0700 |
commit | 86321400385172e6bb938d53ce733f1fd7984b20 (patch) | |
tree | bffa46708212f84d6e0e0d2abf5c78c7273cf708 /services/incremental/IncrementalService.h | |
parent | da208016d65c331218ed3a1acd2f45d5ca4ce006 (diff) |
[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
Diffstat (limited to 'services/incremental/IncrementalService.h')
-rw-r--r-- | services/incremental/IncrementalService.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h index 4fdce4bd92dc..e7705df633d1 100644 --- a/services/incremental/IncrementalService.h +++ b/services/incremental/IncrementalService.h @@ -289,10 +289,11 @@ private: Clock::time_point scheduledTs); private: - std::unique_ptr<VoldServiceWrapper> const mVold; - std::unique_ptr<DataLoaderManagerWrapper> const mDataLoaderManager; - std::unique_ptr<IncFsWrapper> const mIncFs; - std::unique_ptr<AppOpsManagerWrapper> const mAppOpsManager; + const std::unique_ptr<VoldServiceWrapper> mVold; + const std::unique_ptr<DataLoaderManagerWrapper> mDataLoaderManager; + const std::unique_ptr<IncFsWrapper> mIncFs; + const std::unique_ptr<AppOpsManagerWrapper> mAppOpsManager; + const std::unique_ptr<JniWrapper> mJni; const std::string mIncrementalDir; mutable std::mutex mLock; |