commit 57416ae169f49864ebbb65770225d13a4d4f3ec2
author Hall Liu <hallliu@google.com> Wed Dec 19 15:16:54 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 19 15:16:54 2018 -0800
tree 1c9c272c444964dff950090869c4392b7a29c5cc
parent 25f0ff5d5ad986b9433a6ec00d8813846cac97e5
parent 372277f219c9e5a559ed7177ffafb3de29e917b0

Merge changes from topics "dialer-account-suggestion-3", "dialer-account-suggestion-2" am: db5b77c275 am: 5bf7e2cc5c
am: 372277f219

Change-Id: Ied4e9e0ff774c595eb5d82e184e8aa402e05529e

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index fda6004..1e15792 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1281,6 +1281,14 @@
     ctor public PhoneAccountSuggestion(android.telecom.PhoneAccountHandle, int, boolean);
   }
 
+  public class PhoneAccountSuggestionService extends android.app.Service {
+    ctor public PhoneAccountSuggestionService();
+    method public void onAccountSuggestionRequest(java.lang.String);
+    method public android.os.IBinder onBind(android.content.Intent);
+    method public final void suggestPhoneAccounts(java.lang.String, java.util.List<android.telecom.PhoneAccountSuggestion>);
+    field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.PhoneAccountSuggestionService";
+  }
+
 }
 
 package android.telephony {

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