Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bug where the package stats query timeout may crash.

Browse Source 
This adds a null-check to verify that we got real data before
trying to use it and increases the timeout time to reduce the
likelihood of timing out.

Test: FrameworkServicesTests
Bug: 33836034
Change-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396
This commit is contained in:
Daniel Nishi
2016-12-22 11:06:51 -08:00
parent 683dbf1fc6
commit cf76a16e66
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/storage/DiskStatsLoggingService.java
View File

@@ -106,7 +106,7 @@ public class DiskStatsLoggingService extends JobService {
@VisibleForTesting
static class LogRunnable implements Runnable {
private static final long TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(5);
private static final long TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(10);
private JobService mJobService;
private JobParameters mParams;
@@ -147,11 +147,17 @@ public class DiskStatsLoggingService extends JobService {
FileCollector.MeasurementResult downloads =
FileCollector.getMeasurementResult(mDownloadsDirectory);
logToFile(mainCategories, downloads, mCollector.getPackageStats(TIMEOUT_MILLIS),
mSystemSize);
boolean needsReschedule = true;
List<PackageStats> stats = mCollector.getPackageStats(TIMEOUT_MILLIS);
if (stats != null) {
needsReschedule = false;
logToFile(mainCategories, downloads, stats, mSystemSize);
} else {
Log.w("TAG", "Timed out while fetching package stats.");
}
if (mJobService != null) {
mJobService.jobFinished(mParams, false);
mJobService.jobFinished(mParams, needsReschedule);
}
}

21
services/tests/servicestests/src/com/android/server/storage/DiskStatsLoggingServiceTest.java
View File

@@ -18,9 +18,15 @@ package com.android.server.storage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.job.JobService;
import android.app.job.JobParameters;
import android.content.pm.PackageStats;
import android.test.AndroidTestCase;
@@ -130,6 +136,21 @@ public class DiskStatsLoggingServiceTest extends AndroidTestCase {
assertThat(json.getJSONArray(DiskStatsFileLogger.APP_CACHES_KEY).length()).isEqualTo(1L);
}
@Test
public void testDontCrashOnPackageStatsTimeout() throws Exception {
when(mCollector.getPackageStats(anyInt())).thenReturn(null);
LogRunnable task = new LogRunnable();
task.setAppCollector(mCollector);
task.setDownloadsDirectory(mDownloads.getRoot());
task.setRootDirectory(mRootDirectory.getRoot());
task.setLogOutputFile(mInputFile);
task.setSystemSize(10L);
task.run();
// No exception should be thrown.
}
private void writeDataToFile(File f, String data) throws Exception{
PrintStream out = new PrintStream(f);
out.print(data);