Merge "passpoint-r2: add not found failure for osuProvider"

wifi/java/android/net/wifi/hotspot2/OsuProvider.java

@@ -49,7 +49,7 @@ public final class OsuProvider implements Parcelable {
     /**
      * SSID of the network to connect for service sign-up.
      */
-    private final WifiSsid mOsuSsid;
+    private WifiSsid mOsuSsid;
 
     /**
      * Friendly name of the OSU provider.
@@ -130,6 +130,10 @@ public final class OsuProvider implements Parcelable {
         return mOsuSsid;
     }
 
+    public void setOsuSsid(WifiSsid osuSsid) {
+        mOsuSsid = osuSsid;
+    }
+
     public String getFriendlyName() {
         return mFriendlyName;
     }

wifi/java/android/net/wifi/hotspot2/ProvisioningCallback.java

@@ -149,6 +149,12 @@ public abstract class ProvisioningCallback {
      */
     public static final int OSU_FAILURE_ADD_PASSPOINT_CONFIGURATION = 22;
 
+    /**
+     * The reason code for provisioning failure when an {@link OsuProvider} is not found for
+     * provisioning.
+     */
+    public static final int OSU_FAILURE_OSU_PROVIDER_NOT_FOUND = 23;
+
     /**
      * The status code for provisioning flow to indicate connecting to OSU AP
      */