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

Commit 2aee33c1 authored by Geremy Condra's avatar Geremy Condra Committed by Gerrit Code Review
Browse files

Merge "BackupManagerService files need new security labeling."

parents 48718c85 ebab0ae1

core/java/com/android/internal/backup/LocalTransport.java

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.SELinux;

import android.util.Log;



import com.android.org.bouncycastle.util.encoders.Base64;
@@ -64,6 +65,10 @@ public class LocalTransport extends IBackupTransport.Stub { 


    public LocalTransport(Context context) {

        mContext = context;

        mDataDir.mkdirs();

        if (!SELinux.restorecon(mDataDir)) {

            Log.e(TAG, "SELinux restorecon failed for " + mDataDir);

        }

    }



    public Intent configurationIntent() {

services/java/com/android/server/BackupManagerService.java

+12 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.os.ParcelFileDescriptor; 
import android.os.PowerManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.SELinux;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.UserHandle;
@@ -743,6 +744,9 @@ class BackupManagerService extends IBackupManager.Stub { 
        // correct directory.

        mBaseStateDir = new File(Environment.getSecureDataDirectory(), "backup");

        mBaseStateDir.mkdirs();

        if (!SELinux.restorecon(mBaseStateDir)) {

            Slog.e(TAG, "SELinux restorecon failed on " + mBaseStateDir);

        }

        mDataDir = Environment.getDownloadCacheDirectory();



        mPasswordHashFile = new File(mBaseStateDir, "pwhash");
@@ -2133,6 +2137,10 @@ class BackupManagerService extends IBackupManager.Stub { 
                        ParcelFileDescriptor.MODE_CREATE |

                        ParcelFileDescriptor.MODE_TRUNCATE);



                if (!SELinux.restorecon(mBackupDataName)) {

                    Slog.e(TAG, "SELinux restorecon failed on " + mBackupDataName);

                }



                mNewState = ParcelFileDescriptor.open(mNewStateName,

                        ParcelFileDescriptor.MODE_READ_WRITE |

                        ParcelFileDescriptor.MODE_CREATE |
@@ -4572,6 +4580,10 @@ class BackupManagerService extends IBackupManager.Stub { 
                            ParcelFileDescriptor.MODE_CREATE |

                            ParcelFileDescriptor.MODE_TRUNCATE);



                if (!SELinux.restorecon(mBackupDataName)) {

                    Slog.e(TAG, "SElinux restorecon failed for " + mBackupDataName);

                }



                if (mTransport.getRestoreData(mBackupData) != BackupConstants.TRANSPORT_OK) {

                    // Transport-level failure, so we wind everything up and

                    // terminate the restore operation.