commit 3c8856eb7528cbeabb583e3eec98235b324b0814
author Etan Cohen <etancohen@google.com> Mon Mar 11 15:10:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 11 15:10:35 2019 +0000
tree 8ef149b549afb4c63f77ab12c69caf86c0de6ba3
parent 061317ba275d2d34ba14f3ebffb410c2b2f83302
parent 85a7b9fb47462fee0ea81b8001b362f840a2ca74

Merge "[AWARE] Add annotations to ParcelablePeerHandle"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9917f4f..1f4eb8f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30187,7 +30187,7 @@
   }
 
   public final class ParcelablePeerHandle extends android.net.wifi.aware.PeerHandle implements android.os.Parcelable {
-    ctor public ParcelablePeerHandle(android.net.wifi.aware.PeerHandle);
+    ctor public ParcelablePeerHandle(@NonNull android.net.wifi.aware.PeerHandle);
     method public int describeContents();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.ParcelablePeerHandle> CREATOR;

wifi/java/android/net/wifi/aware/ParcelablePeerHandle.java

diff --git a/wifi/java/android/net/wifi/aware/ParcelablePeerHandle.java b/wifi/java/android/net/wifi/aware/ParcelablePeerHandle.java
index ce67abf..ca473db 100644
--- a/wifi/java/android/net/wifi/aware/ParcelablePeerHandle.java
+++ b/wifi/java/android/net/wifi/aware/ParcelablePeerHandle.java
@@ -16,6 +16,7 @@
 
 package android.net.wifi.aware;
 
+import android.annotation.NonNull;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -29,7 +30,7 @@
      *
      * @param peerHandle The {@link PeerHandle} to be made parcelable.
      */
-    public ParcelablePeerHandle(PeerHandle peerHandle) {
+    public ParcelablePeerHandle(@NonNull PeerHandle peerHandle) {
         super(peerHandle.peerId);
     }