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

Commit 811ad796 authored by Howard Chen's avatar Howard Chen Committed by Gerrit Code Review
Browse files

Merge changes from topic "cow_pdb"

* changes:
  Support copy-on-write persistent data block when running a DSU
  Support PersistentDataBlockService in DSU
parents db9e8499 e827aec6
Loading
Loading
Loading
Loading
+43 −12
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.FileUtils;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.SystemProperties;
@@ -103,6 +104,9 @@ import java.util.concurrent.TimeUnit;
public class PersistentDataBlockService extends SystemService {
    private static final String TAG = PersistentDataBlockService.class.getSimpleName();

    private static final String GSI_SANDBOX = "/data/gsi_persistent_data";
    private static final String GSI_RUNNING_PROP = "ro.gsid.image_running";

    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
    private static final int HEADER_SIZE = 8;
    // Magic number to mark block device as adhering to the format consumed by this service
@@ -127,12 +131,13 @@ public class PersistentDataBlockService extends SystemService {
    private static final String FLASH_LOCK_UNLOCKED = "0";

    private final Context mContext;
    private final String mDataBlockFile;
    private final boolean mIsRunningDSU;
    private final Object mLock = new Object();
    private final CountDownLatch mInitDoneSignal = new CountDownLatch(1);

    private int mAllowedUid = -1;
    private long mBlockDeviceSize;
    private String mDataBlockFile;

    @GuardedBy("mLock")
    private boolean mIsWritable = true;
@@ -141,6 +146,7 @@ public class PersistentDataBlockService extends SystemService {
        super(context);
        mContext = context;
        mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP);
        mIsRunningDSU = SystemProperties.getBoolean(GSI_RUNNING_PROP, false);
        mBlockDeviceSize = -1; // Load lazily
    }

@@ -284,14 +290,28 @@ public class PersistentDataBlockService extends SystemService {
        return true;
    }

    private FileOutputStream getBlockOutputStream() throws IOException {
        if (!mIsRunningDSU) {
            return new FileOutputStream(new File(mDataBlockFile));
        } else {
            File sandbox = new File(GSI_SANDBOX);
            File realpdb = new File(SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP));
            if (!sandbox.exists()) {
                FileUtils.copy(realpdb, sandbox);
                mDataBlockFile = GSI_SANDBOX;
            }
            Slog.i(TAG, "PersistentDataBlock copy-on-write");
            return new FileOutputStream(sandbox);
        }
    }

    private boolean computeAndWriteDigestLocked() {
        byte[] digest = computeDigestLocked(null);
        if (digest != null) {
            DataOutputStream outputStream;
            try {
                outputStream = new DataOutputStream(
                        new FileOutputStream(new File(mDataBlockFile)));
            } catch (FileNotFoundException e) {
                outputStream = new DataOutputStream(getBlockOutputStream());
            } catch (IOException e) {
                Slog.e(TAG, "partition not available?", e);
                return false;
            }
@@ -356,8 +376,8 @@ public class PersistentDataBlockService extends SystemService {
    private void formatPartitionLocked(boolean setOemUnlockEnabled) {
        DataOutputStream outputStream;
        try {
            outputStream = new DataOutputStream(new FileOutputStream(new File(mDataBlockFile)));
        } catch (FileNotFoundException e) {
            outputStream = new DataOutputStream(getBlockOutputStream());
        } catch (IOException e) {
            Slog.e(TAG, "partition not available?", e);
            return;
        }
@@ -382,8 +402,8 @@ public class PersistentDataBlockService extends SystemService {
    private void doSetOemUnlockEnabledLocked(boolean enabled) {
        FileOutputStream outputStream;
        try {
            outputStream = new FileOutputStream(new File(mDataBlockFile));
        } catch (FileNotFoundException e) {
            outputStream = getBlockOutputStream();
        } catch (IOException e) {
            Slog.e(TAG, "partition not available", e);
            return;
        }
@@ -459,8 +479,8 @@ public class PersistentDataBlockService extends SystemService {

            DataOutputStream outputStream;
            try {
                outputStream = new DataOutputStream(new FileOutputStream(new File(mDataBlockFile)));
            } catch (FileNotFoundException e) {
                outputStream = new DataOutputStream(getBlockOutputStream());
            } catch (IOException e) {
                Slog.e(TAG, "partition not available?", e);
                return -1;
            }
@@ -545,6 +565,17 @@ public class PersistentDataBlockService extends SystemService {
        public void wipe() {
            enforceOemUnlockWritePermission();

            if (mIsRunningDSU) {
                File sandbox = new File(GSI_SANDBOX);
                if (sandbox.exists()) {
                    if (sandbox.delete()) {
                        mDataBlockFile = SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP);
                    } else {
                        Slog.e(TAG, "Failed to wipe sandbox persistent data block");
                    }
                }
                return;
            }
            synchronized (mLock) {
                int ret = nativeWipe(mDataBlockFile);

@@ -704,8 +735,8 @@ public class PersistentDataBlockService extends SystemService {
        private void writeDataBuffer(long offset, ByteBuffer dataBuffer) {
            FileOutputStream outputStream;
            try {
                outputStream = new FileOutputStream(new File(mDataBlockFile));
            } catch (FileNotFoundException e) {
                outputStream = getBlockOutputStream();
            } catch (IOException e) {
                Slog.e(TAG, "partition not available", e);
                return;
            }
+1 −4
Original line number Diff line number Diff line
@@ -332,8 +332,6 @@ public final class SystemServer {
    private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file";
    private static final String BLOCK_MAP_FILE = "/cache/recovery/block.map";

    private static final String GSI_RUNNING_PROP = "ro.gsid.image_running";

    // maximum number of binder threads used for system_server
    // will be higher than the system default
    private static final int sMaxBinderThreads = 31;
@@ -1443,8 +1441,7 @@ public final class SystemServer {
            t.traceEnd();

            final boolean hasPdb = !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
            final boolean hasGsi = SystemProperties.getInt(GSI_RUNNING_PROP, 0) > 0;
            if (hasPdb && !hasGsi) {
            if (hasPdb) {
                t.traceBegin("StartPersistentDataBlock");
                mSystemServiceManager.startService(PersistentDataBlockService.class);
                t.traceEnd();