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

Remove unused system properties

Browse Source 
Properties ro.config.license_path and ro.config.manual_path are not set
from anywhere but only from a test.

Bug: N/A
Test: mma -j
Change-Id: I651405f3a201f5129bf37059e96e7bcc5efa73bf
(cherry picked from commit 31e37683f0e859d355d0bbb57500498cc0de3962)
This commit is contained in:
Inseob Kim
2018-12-19 12:05:22 +09:00
parent 6c403a876d
commit 4d56f11c4a
3 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/ManualDisplayActivity.java
View File

@@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemProperties;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
@@ -35,8 +34,7 @@ import java.io.File;
public class ManualDisplayActivity extends Activity {
private static final String TAG = "SettingsManualActivity";
private static final String DEFAULT_MANUAL_PATH = "/system/etc/MANUAL.html.gz";
private static final String PROPERTY_MANUAL_PATH = "ro.config.manual_path";
private static final String MANUAL_PATH = "/system/etc/MANUAL.html.gz";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,16 +45,9 @@ public class ManualDisplayActivity extends Activity {
finish(); // No manual to display for this device
}
final String path = SystemProperties.get(PROPERTY_MANUAL_PATH, DEFAULT_MANUAL_PATH);
if (TextUtils.isEmpty(path)) {
Log.e(TAG, "The system property for the manual is empty");
showErrorAndFinish();
return;
}
final File file = new File(path);
final File file = new File(MANUAL_PATH);
if (!file.exists() || file.length() == 0) {
Log.e(TAG, "Manual file " + path + " does not exist");
Log.e(TAG, "Manual file " + MANUAL_PATH + " does not exist");
showErrorAndFinish();
return;
}