commit 7ddcfd698e838efa5e7bd65093dfca05d74b1a5c
author Hall Liu <hallliu@google.com> Mon Dec 10 18:38:11 2018 -0800
committer Hall Liu <hallliu@google.com> Mon Dec 17 15:27:48 2018 -0800
tree 3fe2840e01fc34b92924340aaa14a5cdac4e1fc9
parent c47570d5d0debbb6cbc51ee0e29381b83fd357bd

Enable CTS testing for phone account suggestions

Add TestApi annotation on PhoneAccountSuggestionService and add sensible
equals and hashCode methods to PhoneAccountSuggestions

Bug: 111455117
Test: CTS
Change-Id: I112e350cc637cb086252c53be5e08596e743537d

telecomm/java/android/telecom/PhoneAccountSuggestion.java

diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestion.java b/telecomm/java/android/telecom/PhoneAccountSuggestion.java
index 4e6a178..b401bcf 100644
--- a/telecomm/java/android/telecom/PhoneAccountSuggestion.java
+++ b/telecomm/java/android/telecom/PhoneAccountSuggestion.java
@@ -24,6 +24,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Objects;
 
 public final class PhoneAccountSuggestion implements Parcelable {
 
@@ -132,4 +133,19 @@
         dest.writeInt(mReason);
         dest.writeByte((byte) (mShouldAutoSelect ? 1 : 0));
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PhoneAccountSuggestion that = (PhoneAccountSuggestion) o;
+        return mReason == that.mReason
+                && mShouldAutoSelect == that.mShouldAutoSelect
+                && Objects.equals(mHandle, that.mHandle);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mHandle, mReason, mShouldAutoSelect);
+    }
 }

telecomm/java/android/telecom/PhoneAccountSuggestionService.java

diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestionService.java b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java
index 8a91b9e..ba3822c 100644
--- a/telecomm/java/android/telecom/PhoneAccountSuggestionService.java
+++ b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java
@@ -19,6 +19,7 @@
 import android.annotation.NonNull;
 import android.annotation.SdkConstant;
 import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
@@ -56,6 +57,7 @@
  * @hide
  */
 @SystemApi
+@TestApi
 public class PhoneAccountSuggestionService extends Service {
     /**
      * The {@link Intent} that must be declared in the {@code intent-filter} element of the