Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
This commit is contained in:
@ -1398,9 +1398,11 @@ public abstract class ContentResolver {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void finalize() throws Throwable {
|
protected void finalize() throws Throwable {
|
||||||
|
// TODO: integrate CloseGuard support.
|
||||||
try {
|
try {
|
||||||
if(!mCloseFlag) {
|
if(!mCloseFlag) {
|
||||||
ContentResolver.this.releaseProvider(mContentProvider);
|
Log.w(TAG, "Cursor finalized without prior close()");
|
||||||
|
close();
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
super.finalize();
|
super.finalize();
|
||||||
|
@ -0,0 +1,41 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2010 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package android.content;
|
||||||
|
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.provider.ContactsContract;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
import android.test.suitebuilder.annotation.LargeTest;
|
||||||
|
|
||||||
|
public class ContentResolverTest extends AndroidTestCase {
|
||||||
|
private ContentResolver mContentResolver;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
mContentResolver = mContext.getContentResolver();
|
||||||
|
}
|
||||||
|
|
||||||
|
@LargeTest
|
||||||
|
public void testCursorFinalizer() throws Exception {
|
||||||
|
// TODO: Want a test case that more predictably reproduce this issue. Selected
|
||||||
|
// 600 as this causes the problem 100% of the runs on current hw, it might not
|
||||||
|
// do so on some other configuration though.
|
||||||
|
for (int i = 0; i < 600; i++) {
|
||||||
|
mContentResolver.query(ContactsContract.Contacts.CONTENT_URI, null, null, null, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user