From 20ceb4c6ea60783246b145782f095dcdbb4013c9 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Tue, 26 Nov 2019 18:42:35 -0800
Subject: [PATCH] Expose WifiP2pDevice.update() as public API

Bug: 143892817
Test: compiles
Change-Id: Ibab8b0e1ccd88993978549bd61be21c82e777f41
---
 api/current.txt                                           | 1 +
 .../com/android/server/display/WifiDisplayController.java | 3 +--
 wifi/java/android/net/wifi/p2p/WifiP2pDevice.java         | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index f1c03a4e576d3..4a5a120fb8afe 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30564,6 +30564,7 @@ package android.net.wifi.p2p {
     method @Nullable public android.net.wifi.p2p.WifiP2pWfdInfo getWfdInfo();
     method public boolean isGroupOwner();
     method public boolean isServiceDiscoveryCapable();
+    method public void update(@NonNull android.net.wifi.p2p.WifiP2pDevice);
     method public boolean wpsDisplaySupported();
     method public boolean wpsKeypadSupported();
     method public boolean wpsPbcSupported();
diff --git a/services/core/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java
index 283a78b4e8b45..2992f1e47dc7a 100644
--- a/services/core/java/com/android/server/display/WifiDisplayController.java
+++ b/services/core/java/com/android/server/display/WifiDisplayController.java
@@ -508,8 +508,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
                 Slog.d(TAG, "updateDesiredDevice: new information "
                         + describeWifiP2pDevice(device));
             }
-            mDesiredDevice.updateSupplicantDetails(device);
-            mDesiredDevice.status = device.status;
+            mDesiredDevice.update(device);
             if (mAdvertisedDisplay != null
                     && mAdvertisedDisplay.getDeviceAddress().equals(address)) {
                 readvertiseDisplay(createWifiDisplay(mDesiredDevice));
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
index 13b25209990e4..98ec208f32e64 100644
--- a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pDevice.java
@@ -286,14 +286,12 @@ public class WifiP2pDevice implements Parcelable {
     }
 
     /**
-     * Update device details. This will throw an exception if the device address does not match.
+     * Update this device's details using another {@link WifiP2pDevice} instance.
+     * This will throw an exception if the device address does not match.
      *
-     * @param device to be updated
+     * @param device another instance of {@link WifiP2pDevice} used to update this instance.
      * @throws IllegalArgumentException if the device is null or the device address does not match
-     *
-     * @hide
      */
-    @UnsupportedAppUsage
     public void update(@NonNull WifiP2pDevice device) {
         updateSupplicantDetails(device);
         status = device.status;