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

Merge "Ignore null package names on AppIdleHistory writes" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-03 19:11:38 +00:00
committed by Android (Google) Code Review
parent 93dff1c3bd 8c644b1070
commit 570b037d9d
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/tests/servicestests/src/com/android/server/usage/AppIdleHistoryTests.java
View File

@@ -28,7 +28,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.app.usage.UsageStatsManager;
import android.os.FileUtils; import android.os.FileUtils;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
@@ -150,4 +149,21 @@ public class AppIdleHistoryTests extends AndroidTestCase {
aih = new AppIdleHistory(mStorageDir, 5000); aih = new AppIdleHistory(mStorageDir, 5000);
assertEquals(REASON_MAIN_TIMEOUT, aih.getAppStandbyReason(PACKAGE_1, USER_ID, 5000)); assertEquals(REASON_MAIN_TIMEOUT, aih.getAppStandbyReason(PACKAGE_1, USER_ID, 5000));
} }
public void testNullPackage() throws Exception {
AppIdleHistory aih = new AppIdleHistory(mStorageDir, 1000);
// Report usage of a package
aih.reportUsage(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE,
REASON_SUB_USAGE_MOVE_TO_FOREGROUND, 2000, 0);
// "Accidentally" report usage against a null named package
aih.reportUsage(null, USER_ID, STANDBY_BUCKET_ACTIVE,
REASON_SUB_USAGE_MOVE_TO_FOREGROUND, 2000, 0);
// Persist data
aih.writeAppIdleTimes(USER_ID);
// Recover data from disk
aih = new AppIdleHistory(mStorageDir, 5000);
// Verify data is intact
assertEquals(REASON_MAIN_USAGE | REASON_SUB_USAGE_MOVE_TO_FOREGROUND,
aih.getAppStandbyReason(PACKAGE_1, USER_ID, 3000));
}
} }

9
services/usage/java/com/android/server/usage/AppIdleHistory.java
View File

@@ -578,7 +578,7 @@ public class AppIdleHistory {
} }
} }
} catch (IOException | XmlPullParserException e) { } catch (IOException | XmlPullParserException e) {
Slog.e(TAG, "Unable to read app idle file for user " + userId); Slog.e(TAG, "Unable to read app idle file for user " + userId, e);
} finally { } finally {
IoUtils.closeQuietly(fis); IoUtils.closeQuietly(fis);
} }
@@ -608,6 +608,11 @@ public class AppIdleHistory {
final int N = userHistory.size(); final int N = userHistory.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
String packageName = userHistory.keyAt(i); String packageName = userHistory.keyAt(i);
// Skip any unexpected null package names
if (packageName == null) {
Slog.w(TAG, "Skipping App Idle write for unexpected null package");
continue;
}
AppUsageHistory history = userHistory.valueAt(i); AppUsageHistory history = userHistory.valueAt(i);
xml.startTag(null, TAG_PACKAGE); xml.startTag(null, TAG_PACKAGE);
xml.attribute(null, ATTR_NAME, packageName); xml.attribute(null, ATTR_NAME, packageName);
@@ -641,7 +646,7 @@ public class AppIdleHistory {
appIdleFile.finishWrite(fos); appIdleFile.finishWrite(fos);
} catch (Exception e) { } catch (Exception e) {
appIdleFile.failWrite(fos); appIdleFile.failWrite(fos);
Slog.e(TAG, "Error writing app idle file for user " + userId); Slog.e(TAG, "Error writing app idle file for user " + userId, e);
} }
} }