Fix potential OOM caused by DataProcessManager
The AsyncTasks started in DataProcessManager are not cancelled when fragment is closed. Introduce helper class LifecycleAwareAsyncTask to cancel AsyncTask automatically when lifecycle is stopped. Bug: 384473507 Flag: EXEMPT bug fix Test: Unit test & open/close battery usage screen 1000 times Change-Id: I060f559fa85cc5feb9a42cb8dcc0581782a91d09
This commit is contained in:
@@ -110,6 +110,7 @@ public final class DataProcessManagerTest {
|
||||
mDataProcessManager =
|
||||
new DataProcessManager(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ false,
|
||||
/* rawStartTimestamp= */ 0L,
|
||||
@@ -130,6 +131,7 @@ public final class DataProcessManagerTest {
|
||||
final DataProcessManager dataProcessManager =
|
||||
new DataProcessManager(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* callbackFunction= */ null);
|
||||
assertThat(dataProcessManager.getShowScreenOnTime()).isFalse();
|
||||
@@ -255,6 +257,7 @@ public final class DataProcessManagerTest {
|
||||
final DataProcessManager dataProcessManager =
|
||||
new DataProcessManager(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ false,
|
||||
/* rawStartTimestamp= */ 2L,
|
||||
@@ -346,6 +349,7 @@ public final class DataProcessManagerTest {
|
||||
assertThat(
|
||||
DataProcessManager.getBatteryLevelData(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ false,
|
||||
/* asyncResponseDelegate= */ null))
|
||||
@@ -353,6 +357,7 @@ public final class DataProcessManagerTest {
|
||||
assertThat(
|
||||
DataProcessManager.getBatteryLevelData(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ true,
|
||||
/* asyncResponseDelegate= */ null))
|
||||
@@ -374,6 +379,7 @@ public final class DataProcessManagerTest {
|
||||
final BatteryLevelData resultData =
|
||||
DataProcessManager.getBatteryLevelData(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ false,
|
||||
/* asyncResponseDelegate= */ null);
|
||||
@@ -402,6 +408,7 @@ public final class DataProcessManagerTest {
|
||||
final BatteryLevelData resultData =
|
||||
DataProcessManager.getBatteryLevelData(
|
||||
mContext,
|
||||
null,
|
||||
mUserIdsSeries,
|
||||
/* isFromPeriodJob= */ false,
|
||||
/* asyncResponseDelegate= */ null);
|
||||
|
@@ -0,0 +1,150 @@
|
||||
/*
|
||||
* Copyright (C) 2024 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 com.android.settings.fuelgauge.batteryusage
|
||||
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.LifecycleObserver
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import androidx.test.platform.app.InstrumentationRegistry
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.kotlin.mock
|
||||
import org.mockito.kotlin.never
|
||||
import org.mockito.kotlin.verify
|
||||
import java.util.concurrent.CountDownLatch
|
||||
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class LifecycleAwareAsyncTaskTest {
|
||||
private val instrumentation = InstrumentationRegistry.getInstrumentation()
|
||||
private val lifecycle = mock<Lifecycle>()
|
||||
private val lifecycleOwner = mock<LifecycleOwner>()
|
||||
|
||||
@Test
|
||||
fun addObserver_onPostExecute_onStop() {
|
||||
val taskBeginCountDownLatch = CountDownLatch(1)
|
||||
val taskEndCountDownLatch = CountDownLatch(1)
|
||||
val asyncTask =
|
||||
object : LifecycleAwareAsyncTask<Void?>(lifecycle) {
|
||||
override fun doInBackground(vararg params: Void): Void? {
|
||||
taskBeginCountDownLatch.await()
|
||||
taskEndCountDownLatch.countDown()
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
asyncTask.start()
|
||||
taskBeginCountDownLatch.countDown()
|
||||
verify(lifecycle).addObserver(asyncTask)
|
||||
|
||||
taskEndCountDownLatch.await()
|
||||
asyncTask.onStop(lifecycleOwner)
|
||||
assertThat(asyncTask.isCancelled).isTrue()
|
||||
verify(lifecycle).removeObserver(asyncTask)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun addObserver_onStop() {
|
||||
val executorBlocker = CountDownLatch(1)
|
||||
object : LifecycleAwareAsyncTask<Void?>(null) {
|
||||
override fun doInBackground(vararg params: Void?): Void? {
|
||||
executorBlocker.await()
|
||||
return null
|
||||
}
|
||||
}
|
||||
.start()
|
||||
|
||||
val asyncTask =
|
||||
object : LifecycleAwareAsyncTask<Void?>(lifecycle) {
|
||||
override fun doInBackground(vararg params: Void) = null
|
||||
}
|
||||
|
||||
asyncTask.start()
|
||||
verify(lifecycle).addObserver(asyncTask)
|
||||
|
||||
asyncTask.onStop(lifecycleOwner)
|
||||
executorBlocker.countDown()
|
||||
assertThat(asyncTask.isCancelled).isTrue()
|
||||
verify(lifecycle).removeObserver(asyncTask)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun onPostExecute_addObserver() {
|
||||
val observers = mutableListOf<LifecycleObserver>()
|
||||
val lifecycle =
|
||||
object : Lifecycle() {
|
||||
override val currentState: State
|
||||
get() = State.RESUMED
|
||||
|
||||
override fun addObserver(observer: LifecycleObserver) {
|
||||
observers.add(observer)
|
||||
}
|
||||
|
||||
override fun removeObserver(observer: LifecycleObserver) {
|
||||
observers.remove(observer)
|
||||
}
|
||||
}
|
||||
val asyncTask =
|
||||
object : LifecycleAwareAsyncTask<Void?>(lifecycle) {
|
||||
override fun doInBackground(vararg params: Void) = null
|
||||
}
|
||||
|
||||
Thread { asyncTask.start() }.start()
|
||||
idleAsyncTaskExecutor()
|
||||
instrumentation.waitForIdleSync()
|
||||
|
||||
assertThat(observers).isEmpty()
|
||||
}
|
||||
|
||||
private fun idleAsyncTaskExecutor() {
|
||||
val taskCountDownLatch = CountDownLatch(1)
|
||||
object : LifecycleAwareAsyncTask<Void?>(null) {
|
||||
override fun doInBackground(vararg params: Void): Void? {
|
||||
taskCountDownLatch.countDown()
|
||||
return null
|
||||
}
|
||||
}
|
||||
.start()
|
||||
taskCountDownLatch.await()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun onStop_addObserver() {
|
||||
val executorBlocker = CountDownLatch(1)
|
||||
object : LifecycleAwareAsyncTask<Void?>(null) {
|
||||
override fun doInBackground(vararg params: Void?): Void? {
|
||||
executorBlocker.await()
|
||||
return null
|
||||
}
|
||||
}
|
||||
.start()
|
||||
|
||||
val asyncTask =
|
||||
object : LifecycleAwareAsyncTask<Void?>(lifecycle) {
|
||||
override fun doInBackground(vararg params: Void) = null
|
||||
}
|
||||
|
||||
asyncTask.onStop(lifecycleOwner)
|
||||
assertThat(asyncTask.isCancelled).isTrue()
|
||||
verify(lifecycle).removeObserver(asyncTask)
|
||||
|
||||
asyncTask.start()
|
||||
verify(lifecycle, never()).addObserver(asyncTask)
|
||||
executorBlocker.countDown()
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user