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

am 267d43e6: Merge "Revert "Make verifier device id information visible"" into jb-dev

Browse Source 
* commit '267d43e6b75bcc1b60d4e72e54eec7619cac30dd':
  Revert "Make verifier device id information visible"
This commit is contained in:
Kenny Root
2012-05-09 01:49:11 -07:00
committed by Android Git Automerger
parent 6cd7af24df 267d43e6b7
commit b9b2655f14
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.VerifierDeviceIdentity;
import android.os.BatteryManager;
import android.os.Build;
import android.os.Bundle;
@@ -63,8 +62,6 @@ public class DevelopmentSettings extends PreferenceFragment
OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
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";
@@ -191,13 +188,6 @@ public class DevelopmentSettings extends PreferenceFragment
mAllPrefs.add(mShowAllANRs);
mResetCbPrefs.add(mShowAllANRs);
final Preference verifierDeviceIdentifier = findPreference(VERIFIER_DEVICE_IDENTIFIER);
final PackageManager pm = getActivity().getPackageManager();
final VerifierDeviceIdentity verifierIndentity = pm.getVerifierDeviceIdentity();
if (verifierIndentity != null) {
verifierDeviceIdentifier.setSummary(verifierIndentity.toString());
}
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking);