PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Schematize vold system properties

Browse Source 
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: Id2a696c621015d46015d5de0e7aef987e9e01b54
(cherry picked from commit 64af0081cc1a8babe19b0552122e35211fc84c9d)
This commit is contained in:
Inseob Kim
2018-11-08 12:44:47 +09:00
parent 4f0355aab2
commit a1aeeb24e1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/CryptKeeper.java
View File

@@ -33,11 +33,11 @@ import android.os.Message;
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.storage.IStorageManager;
import android.os.storage.StorageManager;
import android.provider.Settings;
import android.sysprop.VoldProperties;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
import android.text.Editable;
@@ -400,7 +400,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
super.onCreate(savedInstanceState);
// If we are not encrypted or encrypting, get out quickly.
final String state = SystemProperties.get("vold.decrypt");
final String state = VoldProperties.decrypt().orElse("");
if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
disableCryptKeeperComponent(this);
// Typically CryptKeeper is launched as the home app. We didn't
@@ -468,7 +468,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
return;
}
final String progress = SystemProperties.get("vold.encrypt_progress");
final String progress = VoldProperties.encrypt_progress().orElse("");
if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
setContentView(R.layout.crypt_keeper_progress);
encryptionProgressInit();
@@ -636,7 +636,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
}
private void updateProgress() {
final String state = SystemProperties.get("vold.encrypt_progress");
final String state = VoldProperties.encrypt_progress().orElse("");
if ("error_partially_encrypted".equals(state)) {
showFactoryReset(false);
@@ -657,8 +657,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
// Now try to get status as time remaining and replace as appropriate
Log.v(TAG, "Encryption progress: " + progress);
try {
final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");
int time = Integer.parseInt(timeProperty);
int time = VoldProperties.encrypt_time_remaining().get();
if (time >= 0) {
// Round up to multiple of 10 - this way display is less jerky
time = (time + 9) / 10 * 10;