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

Commit 510c8c46 authored by Anthony Stange's avatar Anthony Stange Committed by android-build-merger
Browse files

Merge "Revert "Schematize vold system properties"" 

am: 6ee45c6f

Change-Id: I085d9f227b7632f01cd614d46db7a6da349349fc
parents 63573186 6ee45c6f

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -622,8 +622,6 @@ java_defaults { 
        "core/java/com/android/server/DropboxLogTags.logtags",

        "core/java/org/chromium/arc/EventLogTags.logtags",



        ":platform-properties",



        ":framework-statslog-gen",

    ],

core/java/android/os/storage/StorageManager.java

+2 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import android.os.ServiceManager; 
import android.os.ServiceManager.ServiceNotFoundException;

import android.os.SystemProperties;

import android.provider.Settings;

import android.sysprop.VoldProperties;

import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;
@@ -1466,7 +1465,7 @@ public class StorageManager { 
     * framework, so no service needs to check for changes during their lifespan

     */

    public static boolean isBlockEncrypting() {

        final String state = VoldProperties.encrypt_progress().orElse("");

        final String state = SystemProperties.get("vold.encrypt_progress", "");

        return !"".equalsIgnoreCase(state);

    }
@@ -1482,7 +1481,7 @@ public class StorageManager { 
     * framework, so no service needs to check for changes during their lifespan

     */

    public static boolean inCryptKeeperBounce() {

        final String status = VoldProperties.decrypt().orElse("");

        final String status = SystemProperties.get("vold.decrypt");

        return "trigger_restart_min_framework".equals(status);

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/EncryptionHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar.policy;



import android.sysprop.VoldProperties;

import android.os.SystemProperties;



/**

 * Helper for determining whether the phone is decrypted yet.
@@ -26,7 +26,7 @@ public class EncryptionHelper { 
    public static final boolean IS_DATA_ENCRYPTED = isDataEncrypted();



    private static boolean isDataEncrypted() {

        String voldState = VoldProperties.decrypt().orElse("");

        String voldState = SystemProperties.get("vold.decrypt");

        return "1".equals(voldState) || "trigger_restart_min_framework".equals(voldState);

    }

}

services/core/java/com/android/server/StorageManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ import android.os.storage.VolumeInfo; 
import android.os.storage.VolumeRecord;

import android.provider.MediaStore;

import android.provider.Settings;

import android.sysprop.VoldProperties;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.ArrayMap;
@@ -974,7 +973,7 @@ class StorageManagerService extends IStorageManager.Stub 


        // On an encrypted device we can't see system properties yet, so pull

        // the system locale out of the mount service.

        if ("".equals(VoldProperties.encrypt_progress().orElse(""))) {

        if ("".equals(SystemProperties.get("vold.encrypt_progress"))) {

            copyLocaleFromMountService();

        }

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ import android.provider.Downloads; 
import android.provider.Settings;

import android.service.voice.IVoiceInteractionSession;

import android.service.voice.VoiceInteractionManagerInternal;

import android.sysprop.VoldProperties;

import android.telecom.TelecomManager;

import android.text.TextUtils;

import android.text.format.DateUtils;
@@ -7959,8 +7958,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
            SystemProperties.set("sys.boot_completed", "1");















            // And trigger dev.bootcomplete if we are not showing encryption progress













            if (!"trigger_restart_min_framework".equals(VoldProperties.decrypt().orElse(""))













                    || "".equals(VoldProperties.encrypt_progress().orElse(""))){













            if (!"trigger_restart_min_framework".equals(SystemProperties.get("vold.decrypt"))













                    || "".equals(SystemProperties.get("vold.encrypt_progress"))) {















                SystemProperties.set("dev.bootcomplete", "1");















            }















            mUserController.sendBootCompleted(