diff --git a/device/friendlyelec/nanopi3/aosp_nanopi3.mk b/device/friendlyelec/nanopi3/aosp_nanopi3.mk
index b92a5b3b57b..4de4f206f0a 100644
--- a/device/friendlyelec/nanopi3/aosp_nanopi3.mk
+++ b/device/friendlyelec/nanopi3/aosp_nanopi3.mk
@@ -26,6 +26,10 @@ PRODUCT_MANUFACTURER ?= FriendlyELEC (www.friendlyelec.com)
 
 include device/friendlyelec/nanopi3/bluetooth.mk
 
+ifeq ($(ROCKCHIP_WIFI_DISPLAY), yes)
+PRODUCT_PACKAGES += WifiDisplay
+endif
+
 # for testing only
 ifeq ($(INSTALL_GAPPS_FOR_TESTING), yes)
 
diff --git a/device/rockchip/common/BoardConfig.mk b/device/rockchip/common/BoardConfig.mk
index 785deadec4e..e54054db2f9 100644
--- a/device/rockchip/common/BoardConfig.mk
+++ b/device/rockchip/common/BoardConfig.mk
@@ -324,6 +324,9 @@ BOARD_ENABLE_PMS_MULTI_THREAD_SCAN ?= false
 #for WV keybox provision
 ENABLE_KEYBOX_PROVISION ?= false
 
+#for wfd
+BOARD_WFD_HDCP_SUPPORT ?= false
+
 # product has follow sensors or not,if had override it in product's BoardConfig
 BOARD_HAS_GPS ?= false   
 BOARD_NFC_SUPPORT ?= false
diff --git a/vendor/rockchip/common/apps/WifiDisplay/AndroidManifest.xml b/vendor/rockchip/common/apps/WifiDisplay/AndroidManifest.xml
index afdb6869c72..87198e8964d 100644
--- a/vendor/rockchip/common/apps/WifiDisplay/AndroidManifest.xml
+++ b/vendor/rockchip/common/apps/WifiDisplay/AndroidManifest.xml
@@ -4,18 +4,17 @@
     android:versionName="1.2.0.140115"
     android:sharedUserId="android.uid.system">
     
-	<uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-        <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
-
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="23" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="28" />
 
     <application
         android:icon="@drawable/ic_launcher"
@@ -26,10 +25,16 @@
             android:configChanges="orientation"
             android:windowSoftInputMode="stateUnspecified|adjustNothing"
             android:label="@string/title_activity_wifi_display" >
+            <!-- For Mobile/Tablet -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- For Android TV -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
         </activity>
         
         <!-- activity
@@ -47,14 +52,18 @@
                 <action android:name="com.rockchip.wfd.service" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
         </service>
         
         <!-- receiver android:name=".WifiDisplayBootReceiver">
-			<intent-filter>
-				<action android:name="android.intent.action.BOOT_COMPLETED"/>
-				<category android:name="android.intent.category.LAUNCHER"/>
-			</intent-filter>
-		</receiver-->
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </receiver-->
     </application>
 
 </manifest>
diff --git a/vendor/rockchip/common/apps/WifiDisplay/jni/Android.mk b/vendor/rockchip/common/apps/WifiDisplay/jni/Android.mk
index 879f4487b4d..d200de2bce6 100755
--- a/vendor/rockchip/common/apps/WifiDisplay/jni/Android.mk
+++ b/vendor/rockchip/common/apps/WifiDisplay/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-ifeq (1, $(strip $(shell expr $(PLATFORM_SDK_VERSION) \<= 27)))
+ifeq ($(BOARD_WFD_HDCP_SUPPORT), true)
 LOCAL_CPPFLAGS += -DWFD_HDCP_SUPPORT
 endif
 
diff --git a/vendor/rockchip/common/apps/WifiDisplay/src/com/rockchip/wfd/WifiDisplayService.java b/vendor/rockchip/common/apps/WifiDisplay/src/com/rockchip/wfd/WifiDisplayService.java
index 1e700b51919..024f97d787d 100755
--- a/vendor/rockchip/common/apps/WifiDisplay/src/com/rockchip/wfd/WifiDisplayService.java
+++ b/vendor/rockchip/common/apps/WifiDisplay/src/com/rockchip/wfd/WifiDisplayService.java
@@ -173,6 +173,7 @@ public class WifiDisplayService extends Service {
                 WifiP2pWfdInfo wfdInfo = new WifiP2pWfdInfo();
                 wfdInfo.setEnabled(true);
                 wfdInfo.setDeviceType(WifiP2pWfdInfo.DEVICE_TYPE_PRIMARY_SINK);
+                wfdInfo.setContentProtectionSupported(true);
                 wfdInfo.setSessionAvailable(true);
                 wfdInfo.setControlPort(WFD.WFD_CONTROL_PORT);
                 wfdInfo.setMaxThroughput(WFD.WFD_MAX_THROUGHPUT);