Merge "Fix issue with history deletion" into rvc-dev am: aec73f132b (b96aaf7f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationHistoryDatabase.java

+5 −29

Original line number	Diff line number	Diff line
		@@ -84,14 +84,12 @@ public class NotificationHistoryDatabase {
		// Current version of the database files schema
		private int mCurrentVersion;
		private final WriteBufferRunnable mWriteBufferRunnable;
		private final FileAttrProvider mFileAttrProvider;

		// Object containing posted notifications that have not yet been written to disk
		@VisibleForTesting
		NotificationHistory mBuffer;

		public NotificationHistoryDatabase(Context context, Handler fileWriteHandler, File dir,
		FileAttrProvider fileAttrProvider) {
		public NotificationHistoryDatabase(Context context, Handler fileWriteHandler, File dir) {
		mContext = context;
		mAlarmManager = context.getSystemService(AlarmManager.class);
		mCurrentVersion = DEFAULT_CURRENT_VERSION;
		@@ -101,7 +99,6 @@ public class NotificationHistoryDatabase {
		mHistoryFiles = new LinkedList<>();
		mBuffer = new NotificationHistory();
		mWriteBufferRunnable = new WriteBufferRunnable();
		mFileAttrProvider = fileAttrProvider;

		IntentFilter deletionFilter = new IntentFilter(ACTION_HISTORY_DELETION);
		deletionFilter.addDataScheme(SCHEME_DELETION);
		@@ -131,8 +128,8 @@ public class NotificationHistoryDatabase {
		}

		// Sort with newest files first
		Arrays.sort(files, (lhs, rhs) -> Long.compare(mFileAttrProvider.getCreationTime(rhs),
		mFileAttrProvider.getCreationTime(lhs)));
		Arrays.sort(files, (lhs, rhs) -> Long.compare(Long.parseLong(rhs.getName()),
		Long.parseLong(lhs.getName())));

		for (File file : files) {
		mHistoryFiles.addLast(new AtomicFile(file));
		@@ -255,10 +252,9 @@ public class NotificationHistoryDatabase {

		for (int i = mHistoryFiles.size() - 1; i >= 0; i--) {
		final AtomicFile currentOldestFile = mHistoryFiles.get(i);
		final long creationTime =
		mFileAttrProvider.getCreationTime(currentOldestFile.getBaseFile());
		final long creationTime = Long.parseLong(currentOldestFile.getBaseFile().getName());
		if (DEBUG) {
		Slog.d(TAG, "Pruning " + currentOldestFile.getBaseFile().getName()
		Slog.d(TAG, "File " + currentOldestFile.getBaseFile().getName()
		+ " created on " + creationTime);
		}
		if (creationTime <= retentionBoundary.getTimeInMillis()) {
		@@ -469,24 +465,4 @@ public class NotificationHistoryDatabase {
		}
		}
		}

		public static final class NotificationHistoryFileAttrProvider implements
		NotificationHistoryDatabase.FileAttrProvider {
		final static String TAG = "NotifHistoryFileDate";

		public long getCreationTime(File file) {
		try {
		BasicFileAttributes attr = Files.readAttributes(FileSystems.getDefault().getPath(
		file.getAbsolutePath()), BasicFileAttributes.class);
		return attr.creationTime().to(TimeUnit.MILLISECONDS);
		} catch (Exception e) {
		Slog.w(TAG, "Cannot read creation data for file; using file name");
		return Long.valueOf(file.getName());
		}
		}
		}

		interface FileAttrProvider {
		long getCreationTime(File file);
		}
		}

services/core/java/com/android/server/notification/NotificationHistoryDatabaseFactory.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -31,11 +31,10 @@ public class NotificationHistoryDatabaseFactory {
		}

		public static NotificationHistoryDatabase create(@NonNull Context context,
		@NonNull Handler handler, @NonNull File rootDir,
		@NonNull NotificationHistoryDatabase.FileAttrProvider fileAttrProvider) {
		@NonNull Handler handler, @NonNull File rootDir) {
		if(sTestingNotificationHistoryDb != null) {
		return sTestingNotificationHistoryDb;
		}
		return new NotificationHistoryDatabase(context, handler, rootDir, fileAttrProvider);
		return new NotificationHistoryDatabase(context, handler, rootDir);
		}
		}

services/core/java/com/android/server/notification/NotificationHistoryManager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.util.SparseBooleanArray;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.IoThread;
		import com.android.server.notification.NotificationHistoryDatabase.NotificationHistoryFileAttrProvider;

		import java.io.File;
		import java.util.ArrayList;
		@@ -291,7 +290,7 @@ public class NotificationHistoryManager {
		final File historyDir = new File(Environment.getDataSystemCeDirectory(userId),
		DIRECTORY_PER_USER);
		userHistory = NotificationHistoryDatabaseFactory.create(mContext, IoThread.getHandler(),
		historyDir, new NotificationHistoryFileAttrProvider());
		historyDir);
		if (mUserUnlockedStates.get(userId)) {
		try {
		userHistory.init();

services/tests/uiservicestests/src/com/android/server/notification/NotificationHistoryDatabaseTest.java

+3 −15

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
		Context mContext;
		@Mock
		AlarmManager mAlarmManager;
		TestFileAttrProvider mFileAttrProvider;

		NotificationHistoryDatabase mDataBase;

		@@ -103,11 +102,9 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
		when(mContext.getUser()).thenReturn(getContext().getUser());
		when(mContext.getPackageName()).thenReturn(getContext().getPackageName());

		mFileAttrProvider = new TestFileAttrProvider();
		mRootDir = new File(mContext.getFilesDir(), "NotificationHistoryDatabaseTest");

		mDataBase = new NotificationHistoryDatabase(
		mContext, mFileWriteHandler, mRootDir, mFileAttrProvider);
		mDataBase = new NotificationHistoryDatabase(mContext, mFileWriteHandler, mRootDir);
		mDataBase.init();
		}

		@@ -127,7 +124,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
		// add 5 files with a creation date of "today"
		for (long i = cal.getTimeInMillis(); i >= 5; i--) {
		File file = mock(File.class);
		mFileAttrProvider.creationDates.put(file, i);
		when(file.getName()).thenReturn(String.valueOf(i));
		AtomicFile af = new AtomicFile(file);
		expectedFiles.add(af);
		mDataBase.mHistoryFiles.addLast(af);
		@@ -137,7 +134,7 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
		// Add 5 more files more than retainDays old
		for (int i = 5; i >= 0; i--) {
		File file = mock(File.class);
		mFileAttrProvider.creationDates.put(file, cal.getTimeInMillis() - i);
		when(file.getName()).thenReturn(String.valueOf(cal.getTimeInMillis() - i));
		AtomicFile af = new AtomicFile(file);
		mDataBase.mHistoryFiles.addLast(af);
		}
		@@ -331,13 +328,4 @@ public class NotificationHistoryDatabaseTest extends UiServiceTestCase {
		verify(nh).removeConversationFromWrite("pkg", "convo");
		verify(af, never()).startWrite();
		}

		private class TestFileAttrProvider implements NotificationHistoryDatabase.FileAttrProvider {
		public Map<File, Long> creationDates = new HashMap<>();

		@Override
		public long getCreationTime(File file) {
		return creationDates.get(file);
		}
		}
		}