diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-03 23:21:57 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-03 23:21:57 -0400 |
commit | 4d01eeaffaa720e4458a118baa137a11614f00f7 (patch) | |
tree | 66751893566986236788e3c796a7cc5e90d05f52 /android/view/WindowId.java | |
parent | a192cc2a132cb0ee8588e2df755563ec7008c179 (diff) | |
download | android-28-4d01eeaffaa720e4458a118baa137a11614f00f7.tar.gz |
Import Android SDK Platform P [4697573]
/google/data/ro/projects/android/fetch_artifact \
--bid 4697573 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4697573.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: If80578c3c657366cc9cf75f8db13d46e2dd4e077
Diffstat (limited to 'android/view/WindowId.java')
-rw-r--r-- | android/view/WindowId.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/android/view/WindowId.java b/android/view/WindowId.java index c4cda2c7..12e58f14 100644 --- a/android/view/WindowId.java +++ b/android/view/WindowId.java @@ -16,6 +16,8 @@ package android.view; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -35,6 +37,7 @@ import java.util.HashMap; * that doesn't allow the other process to negatively harm your window. */ public class WindowId implements Parcelable { + @NonNull private final IWindowId mToken; /** @@ -74,8 +77,7 @@ public class WindowId implements Parcelable { } }; - final HashMap<IBinder, WindowId> mRegistrations - = new HashMap<IBinder, WindowId>(); + final HashMap<IBinder, WindowId> mRegistrations = new HashMap<>(); class H extends Handler { @Override @@ -163,10 +165,9 @@ public class WindowId implements Parcelable { * same package. */ @Override - public boolean equals(Object otherObj) { + public boolean equals(@Nullable Object otherObj) { if (otherObj instanceof WindowId) { - return mToken.asBinder().equals(((WindowId) otherObj) - .mToken.asBinder()); + return mToken.asBinder().equals(((WindowId) otherObj).mToken.asBinder()); } return false; } @@ -182,7 +183,7 @@ public class WindowId implements Parcelable { sb.append("IntentSender{"); sb.append(Integer.toHexString(System.identityHashCode(this))); sb.append(": "); - sb.append(mToken != null ? mToken.asBinder() : null); + sb.append(mToken.asBinder()); sb.append('}'); return sb.toString(); } @@ -195,30 +196,32 @@ public class WindowId implements Parcelable { out.writeStrongBinder(mToken.asBinder()); } - public static final Parcelable.Creator<WindowId> CREATOR - = new Parcelable.Creator<WindowId>() { + public static final Parcelable.Creator<WindowId> CREATOR = new Parcelable.Creator<WindowId>() { + @Override public WindowId createFromParcel(Parcel in) { IBinder target = in.readStrongBinder(); return target != null ? new WindowId(target) : null; } + @Override public WindowId[] newArray(int size) { return new WindowId[size]; } }; /** @hide */ + @NonNull public IWindowId getTarget() { return mToken; } /** @hide */ - public WindowId(IWindowId target) { + public WindowId(@NonNull IWindowId target) { mToken = target; } /** @hide */ - public WindowId(IBinder target) { + public WindowId(@NonNull IBinder target) { mToken = IWindowId.Stub.asInterface(target); } } |