Merge "[SettingsProvider] do not close MemoryIntArray if in system server" into udc-dev am: 22e76c5405 am: c651c8b7c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23217745 Change-Id: I6bc2ce4a483c8ee86a17efb4ee3f8e1c57e219ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3036,7 +3036,9 @@ public final class Settings {
|
||||
|
||||
public void destroy() {
|
||||
try {
|
||||
if (!mArray.isClosed()) {
|
||||
// If this process is the system server process, mArray is the same object as
|
||||
// the memory int array kept inside SettingsProvider, so skipping the close()
|
||||
if (!Settings.isInSystemServer() && !mArray.isClosed()) {
|
||||
mArray.close();
|
||||
}
|
||||
} catch (IOException e) {
|
||||
|
||||
Reference in New Issue
Block a user