diff --git a/packages/BackupEncryption/Android.bp b/packages/BackupEncryption/Android.bp new file mode 100644 index 0000000000000..50dbcdb1b4c79 --- /dev/null +++ b/packages/BackupEncryption/Android.bp @@ -0,0 +1,24 @@ +// +// Copyright (C) 2019 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. +// + +android_app { + name: "BackupEncryption", + srcs: ["src/**/*.java"], + optimize: { enabled: false }, + platform_apis: true, + certificate: "platform", + privileged: true, +} \ No newline at end of file diff --git a/packages/BackupEncryption/AndroidManifest.xml b/packages/BackupEncryption/AndroidManifest.xml new file mode 100644 index 0000000000000..a705df5a425b1 --- /dev/null +++ b/packages/BackupEncryption/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/packages/BackupEncryption/proguard.flags b/packages/BackupEncryption/proguard.flags new file mode 100644 index 0000000000000..851ce8caab436 --- /dev/null +++ b/packages/BackupEncryption/proguard.flags @@ -0,0 +1 @@ +-keep class com.android.server.backup.encryption diff --git a/services/backup/java/com/android/server/backup/encryption/chunk/Chunk.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/Chunk.java similarity index 73% rename from services/backup/java/com/android/server/backup/encryption/chunk/Chunk.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/Chunk.java index 5bec1a94e9150..ba328609a77e8 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunk/Chunk.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/Chunk.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2018 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.server.backup.encryption.chunk; import android.util.proto.ProtoInputStream; @@ -51,4 +67,4 @@ public class Chunk { public byte[] getHash() { return mHash; } -} \ No newline at end of file +} diff --git a/services/backup/java/com/android/server/backup/encryption/chunk/ChunkHash.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkHash.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunk/ChunkHash.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkHash.java index 1ae598ec99209..1630eb8ff4e88 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunk/ChunkHash.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkHash.java @@ -11,12 +11,13 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; import com.android.internal.util.Preconditions; + import java.util.Arrays; import java.util.Base64; diff --git a/services/backup/java/com/android/server/backup/encryption/chunk/ChunkListingMap.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkListingMap.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunk/ChunkListingMap.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkListingMap.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunk/ChunkOrderingType.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkOrderingType.java similarity index 97% rename from services/backup/java/com/android/server/backup/encryption/chunk/ChunkOrderingType.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkOrderingType.java index df36c94097327..8cb028e46e9dd 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunk/ChunkOrderingType.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkOrderingType.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; @@ -21,6 +21,7 @@ import static com.android.server.backup.encryption.chunk.ChunksMetadataProto.EXP import static com.android.server.backup.encryption.chunk.ChunksMetadataProto.INLINE_LENGTHS; import android.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/services/backup/java/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java similarity index 96% rename from services/backup/java/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java index 3a6d1f62faaac..edf1b9abb8223 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrdering.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; @@ -38,6 +38,7 @@ public class EncryptedChunkOrdering { private final byte[] mEncryptedChunkOrdering; + /** Get the encrypted chunk ordering */ public byte[] encryptedChunkOrdering() { return mEncryptedChunkOrdering; } diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/BackupWriter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupWriter.java similarity index 97% rename from services/backup/java/com/android/server/backup/encryption/chunking/BackupWriter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupWriter.java index 68d9d145139f5..baa820cbd558b 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/BackupWriter.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/BackupWriter.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/ByteRange.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ByteRange.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/ByteRange.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ByteRange.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/ChunkEncryptor.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkEncryptor.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunking/ChunkEncryptor.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkEncryptor.java index 812cfbd76e31e..48abc8cc4088e 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/ChunkEncryptor.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkEncryptor.java @@ -11,16 +11,18 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.server.backup.encryption.chunk.ChunkHash; + import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/ChunkHasher.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkHasher.java similarity index 97% rename from services/backup/java/com/android/server/backup/encryption/chunking/ChunkHasher.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkHasher.java index 145b7bf825172..02d498ccd7261 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/ChunkHasher.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/ChunkHasher.java @@ -11,14 +11,16 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.server.backup.encryption.chunk.ChunkHash; + import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; + import javax.crypto.Mac; import javax.crypto.SecretKey; diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/Chunker.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/Chunker.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunking/Chunker.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/Chunker.java index b91913e5fc80f..c9a6293ed0608 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/Chunker.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/Chunker.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutput.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriter.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptWriter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptWriter.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/DiffScriptWriter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/DiffScriptWriter.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunk.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunk.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunk.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunk.java index 1f936eb2bfa50..cde59fa189de6 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunk.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunk.java @@ -11,13 +11,14 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.internal.util.Preconditions; import com.android.server.backup.encryption.chunk.ChunkHash; + import java.util.Arrays; import java.util.Objects; diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java similarity index 97% rename from services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java index eaf701ce0bf51..16beda32af172 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/EncryptedChunkEncoder.java @@ -11,12 +11,13 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.server.backup.encryption.chunk.ChunkOrderingType; + import java.io.IOException; /** Encodes an {@link EncryptedChunk} as bytes to write to the encrypted backup file. */ diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java index 5c902cad74953..7b38dd4a1dc34 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoder.java @@ -11,13 +11,14 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.server.backup.encryption.chunk.ChunkOrderingType; import com.android.server.backup.encryption.chunk.ChunksMetadataProto; + import java.io.IOException; /** diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java similarity index 98% rename from services/backup/java/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java index 4b849818f1c35..567f75d595132 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoder.java @@ -11,13 +11,14 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; import com.android.server.backup.encryption.chunk.ChunkOrderingType; import com.android.server.backup.encryption.chunk.ChunksMetadataProto; + import java.io.IOException; /** diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/OutputStreamWrapper.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/RawBackupWriter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/RawBackupWriter.java similarity index 82% rename from services/backup/java/com/android/server/backup/encryption/chunking/RawBackupWriter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/RawBackupWriter.java index 839dc7c7b5ce1..b211b0fc94708 100644 --- a/services/backup/java/com/android/server/backup/encryption/chunking/RawBackupWriter.java +++ b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/RawBackupWriter.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; @@ -21,18 +21,18 @@ import java.io.OutputStream; /** Writes data straight to an output stream. */ public class RawBackupWriter implements BackupWriter { - private final OutputStream outputStream; - private long bytesWritten; + private final OutputStream mOutputStream; + private long mBytesWritten; /** Constructs a new writer which writes bytes to the given output stream. */ public RawBackupWriter(OutputStream outputStream) { - this.outputStream = outputStream; + this.mOutputStream = outputStream; } @Override public void writeBytes(byte[] bytes) throws IOException { - outputStream.write(bytes); - bytesWritten += bytes.length; + mOutputStream.write(bytes); + mBytesWritten += bytes.length; } @Override @@ -42,11 +42,11 @@ public class RawBackupWriter implements BackupWriter { @Override public long getBytesWritten() { - return bytesWritten; + return mBytesWritten; } @Override public void flush() throws IOException { - outputStream.flush(); + mOutputStream.flush(); } } diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriter.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunker.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixer.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/cdc/Hkdf.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/Hkdf.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpoint.java diff --git a/services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64.java diff --git a/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKey.java diff --git a/services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManager.java diff --git a/services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyGenerator.java diff --git a/services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTracker.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDb.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDb.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDb.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDb.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbContract.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/BackupEncryptionDbHelper.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/EncryptionDbException.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/EncryptionDbException.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/EncryptionDbException.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/EncryptionDbException.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/TertiaryKey.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKey.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/TertiaryKey.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKey.java diff --git a/services/backup/java/com/android/server/backup/encryption/storage/TertiaryKeysTable.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKeysTable.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/storage/TertiaryKeysTable.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/storage/TertiaryKeysTable.java diff --git a/services/backup/java/com/android/server/backup/encryption/tasks/BackupEncrypter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupEncrypter.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/tasks/BackupEncrypter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupEncrypter.java diff --git a/services/backup/java/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypter.java diff --git a/services/backup/java/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/DecryptedChunkOutput.java diff --git a/services/backup/java/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java b/packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java similarity index 100% rename from services/backup/java/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java rename to packages/BackupEncryption/src/com/android/server/backup/encryption/tasks/EncryptedRestoreException.java diff --git a/packages/BackupEncryption/test/robolectric/Android.bp b/packages/BackupEncryption/test/robolectric/Android.bp new file mode 100644 index 0000000000000..6d1abbb61a8e4 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/Android.bp @@ -0,0 +1,32 @@ +// Copyright (C) 2018 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. + +android_robolectric_test { + name: "BackupEncryptionRoboTests", + srcs: [ + "src/**/*.java", + ":FrameworksServicesRoboShadows", + ], + java_resource_dirs: ["config"], + libs: [ + "platform-test-annotations", + "testng", + ], + instrumentation_for: "BackupEncryption", +} + +filegroup { + name: "BackupEncryptionRoboShadows", + srcs: ["src/com/android/server/testing/shadows/**/*.java"], +} diff --git a/packages/BackupEncryption/test/robolectric/AndroidManifest.xml b/packages/BackupEncryption/test/robolectric/AndroidManifest.xml new file mode 100644 index 0000000000000..ae5cdd918abdd --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/packages/BackupEncryption/test/robolectric/config/robolectric.properties b/packages/BackupEncryption/test/robolectric/config/robolectric.properties new file mode 100644 index 0000000000000..26fceb3f84a49 --- /dev/null +++ b/packages/BackupEncryption/test/robolectric/config/robolectric.properties @@ -0,0 +1,17 @@ +# +# Copyright (C) 2019 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. +# + +sdk=NEWEST_SDK diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java index 3f57240bc0e97..c12464c501755 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkHashTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkListingMapTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkTest.java similarity index 99% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkTest.java index 17c9a86169be7..1796f56ce17a1 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/ChunkTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/ChunkTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java index 0bf14174e5c33..c6b29b7b7236c 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunk/EncryptedChunkOrderingTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunk; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ByteRangeTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java similarity index 86% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java index d0e5fb335da93..19e3b28f85e7c 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkEncryptorTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; @@ -78,22 +78,22 @@ public class ChunkEncryptorTest { // Return NONCE_1, then NONCE_2 for invocations of mSecureRandomMock.nextBytes(). doAnswer( - new Answer() { - private int mInvocation = 0; + new Answer() { + private int mInvocation = 0; - @Override - public Void answer(InvocationOnMock invocation) { - byte[] nonceDestination = invocation.getArgument(0); - System.arraycopy( - NONCES[this.mInvocation], - 0, - nonceDestination, - 0, - GCM_NONCE_LENGTH_BYTES); - this.mInvocation++; - return null; - } - }) + @Override + public Void answer(InvocationOnMock invocation) { + byte[] nonceDestination = invocation.getArgument(0); + System.arraycopy( + NONCES[this.mInvocation], + 0, + nonceDestination, + 0, + GCM_NONCE_LENGTH_BYTES); + this.mInvocation++; + return null; + } + }) .when(mSecureRandomMock) .nextBytes(any(byte[].class)); } diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java index 2bbbf28571460..72a927db743d9 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/ChunkHasherTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DecryptedChunkFileOutputTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/DiffScriptBackupWriterTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java similarity index 99% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java index 8e801a1339090..325b601e2ccbb 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/EncryptedChunkTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java index 2f872beacd17d..634acdc42eaf4 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/InlineLengthsEncryptedChunkEncoderTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java index 978bddb7301a1..d231603e18b17 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/LengthlessEncryptedChunkEncoderTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java similarity index 98% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java index 19ef8fb339ba2..966d3e2d583d9 100644 --- a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/RawBackupWriterTest.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.encryption.chunking; diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/SingleStreamDiffScriptWriterTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/ContentDefinedChunkerTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/FingerprintMixerTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/HkdfTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/IsChunkBreakpointTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/chunking/cdc/RabinFingerprint64Test.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyManagerTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/RecoverableKeyStoreSecondaryKeyTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyGeneratorTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/keys/TertiaryKeyRotationTrackerTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/BackupEncryptionDbTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/storage/TertiaryKeysTableTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/encryption/tasks/BackupStreamEncrypterTest.java diff --git a/services/robotests/backup/src/com/android/server/backup/testing/RandomInputStream.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/backup/testing/RandomInputStream.java similarity index 100% rename from services/robotests/backup/src/com/android/server/backup/testing/RandomInputStream.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/backup/testing/RandomInputStream.java diff --git a/services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java similarity index 97% rename from services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java index 0428796f51fad..3f3494d2c22ca 100644 --- a/services/robotests/backup/src/com/android/server/backup/testing/CryptoTestUtils.java +++ b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/CryptoTestUtils.java @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.server.backup.testing; diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java similarity index 100% rename from services/robotests/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowInternalRecoveryServiceException.java diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowRecoveryController.java b/packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowRecoveryController.java similarity index 100% rename from services/robotests/src/com/android/server/testing/shadows/ShadowRecoveryController.java rename to packages/BackupEncryption/test/robolectric/src/com/android/server/testing/shadows/ShadowRecoveryController.java