Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev

Browse Source 
* commit 'ddfaa3f55638db2e3d7c9928b605c2e6b90facae':
  Provide a debugging option to force enable wifi display.
This commit is contained in:
Jeff Brown
2012-09-20 20:23:25 -07:00
committed by Android Git Automerger
parent 45e843304f ddfaa3f556
commit d00110c18b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/display/DisplayManagerService.java
View File

@@ -89,6 +89,11 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
private static final String TAG = "DisplayManagerService";
private static final boolean DEBUG = false;
// When this system property is set to 0, WFD is forcibly disabled on boot.
// When this system property is set to 1, WFD is forcibly enabled on boot.
// Otherwise WFD is enabled according to the value of config_enableWifiDisplay.
private static final String FORCE_WIFI_DISPLAY_ENABLE = "persist.debug.wfd.enable";
private static final String SYSTEM_HEADLESS = "ro.config.headless";
private static final long WAIT_FOR_DEFAULT_DISPLAY_TIMEOUT = 10000;
@@ -499,7 +504,8 @@ public final class DisplayManagerService extends IDisplayManager.Stub {
private void registerWifiDisplayAdapterLocked() {
if (mContext.getResources().getBoolean(
com.android.internal.R.bool.config_enableWifiDisplay)) {
com.android.internal.R.bool.config_enableWifiDisplay)
|| SystemProperties.getInt(FORCE_WIFI_DISPLAY_ENABLE, -1) == 1) {
mWifiDisplayAdapter = new WifiDisplayAdapter(
mSyncRoot, mContext, mHandler, mDisplayAdapterListener,
mPersistentDataStore);