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

Merge "Make verifier device id information visible"

Browse Source
This commit is contained in:
Kenny Root
2011-09-26 14:38:10 -07:00
committed by Android (Google) Code Review
parent 4bce4dc1c3 498fbe470e
commit 3f1fb4f154
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,8 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.VerifierDeviceIdentity;
import android.os.BatteryManager;
import android.os.Build;
import android.os.Bundle;
@@ -51,6 +53,8 @@ public class DevelopmentSettings extends PreferenceFragment
OnPreferenceChangeListener {
private static final String ENABLE_ADB = "enable_adb";
private static final String VERIFIER_DEVICE_IDENTIFIER = "verifier_device_identifier";
private static final String KEEP_SCREEN_ON = "keep_screen_on";
private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
@@ -130,6 +134,13 @@ public class DevelopmentSettings extends PreferenceFragment
mShowAllANRs = (CheckBoxPreference) findPreference(
SHOW_ALL_ANRS_KEY);
final Preference verifierDeviceIdentifier = findPreference(VERIFIER_DEVICE_IDENTIFIER);
final PackageManager pm = getActivity().getPackageManager();
final VerifierDeviceIdentity verifierIndentity = pm.getVerifierDeviceIdentity();
if (verifierIndentity != null) {
verifierDeviceIdentifier.setSummary(verifierIndentity.toString());
}
removeHdcpOptionsForProduction();
}