Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d098c28 authored by Al Sutton's avatar Al Sutton Committed by Android (Google) Code Review
Browse files

Merge "Move backup encryption to separate APK"

parents ab2c31a3 ad52c6bc

packages/BackupEncryption/Android.bp

0 → 100644
+24 −0
Original line number Diff line number Diff line 
//

// 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

packages/BackupEncryption/AndroidManifest.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

 * Copyright (c) 2016 Google Inc.

 *

 * 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.

 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.server.backup.encryption"

    android:sharedUserId="android.uid.system" >



    <application android:allowBackup="false" />

</manifest>

packages/BackupEncryption/proguard.flags

0 → 100644
+1 −0
Original line number Diff line number Diff line 
-keep class com.android.server.backup.encryption

services/backup/java/com/android/server/backup/encryption/chunk/Chunk.java→packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/Chunk.java

+17 −1
Original line number Diff line number Diff line 
/*

 * 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;

services/backup/java/com/android/server/backup/encryption/chunk/ChunkHash.java→packages/BackupEncryption/src/com/android/server/backup/encryption/chunk/ChunkHash.java

+2 −1
Original line number Diff line number Diff line
@@ -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;