ad52c6bc3a56f8ec7b7c32e38fe28659cbba7109 - SHIFTPHONES/android_frameworks_base

commit	ad52c6bc3a56f8ec7b7c32e38fe28659cbba7109	[log] [tgz]
author	Al Sutton <alsutton@google.com>	Wed Sep 04 16:21:28 2019 +0100
committer	Al Sutton <alsutton@google.com>	Fri Sep 06 10:22:33 2019 +0100
tree	8298143d847ffd410c8de0cd9b64cdcebcaea444
parent	3c8783a3a263ab4bee316e63905f8bdaab74eff0 [diff]

Move backup encryption to separate APK

Test: atest -c --rebuild-module-info BackupEncryptionRoboTests
Change-Id: I5a8ac3a9c010bd3c516464dee333cef406c5dcfa

packages/BackupEncryption/Android.bp[Added - diff]
packages/BackupEncryption/AndroidManifest.xml[Added - diff]
packages/BackupEncryption/proguard.flags[Added - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/Chunk.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunk/Chunk.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkHash.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunk/ChunkHash.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkListingMap.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunk/ChunkListingMap.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkOrderingType.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunk/ChunkOrderingType.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupWriter.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/BackupWriter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ByteRange.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/ByteRange.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkEncryptor.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/ChunkEncryptor.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkHasher.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/ChunkHasher.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/Chunker.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/Chunker.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptWriter.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptWriter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunk.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunk.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/RawBackupWriter.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/RawBackupWriter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java[Renamed from services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java[Renamed from services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java[Renamed from services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java[Renamed from services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java[Renamed from services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDb.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDb.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/EncryptionDbException.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/EncryptionDbException.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKey.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/TertiaryKey.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKeysTable.java[Renamed from services/backup/java/com/android/server/backup/encryption/storage/TertiaryKeysTable.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupEncrypter.java[Renamed from services/backup/java/com/android/server/backup/encryption/tasks/BackupEncrypter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java[Renamed from services/backup/java/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java[Renamed from services/backup/java/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java - diff]
packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java[Renamed from services/backup/java/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java - diff]
packages/BackupEncryption/test/robolectric/Android.bp[Added - diff]
packages/BackupEncryption/test/robolectric/AndroidManifest.xml[Added - diff]
packages/BackupEncryption/test/robolectric/config/robolectric.properties[Added - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java[Renamed from services/robotests/backup/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/backup/testing/RandomInputStream.java[Renamed from services/robotests/backup/src/com/android/server/backup/testing/RandomInputStream.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java[Renamed from services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java[Renamed from services/robotests/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java - diff]
packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowRecoveryController.java[Renamed from services/robotests/src/com/android/server/testing/shadows/ShadowRecoveryController.java - diff]

75 files changed