From 6042fca3f2b4bd2157c422a0c1262bf29218db58 Mon Sep 17 00:00:00 2001
From: Wei Sheng Shih <wilsonshih@google.com>
Date: Wed, 6 Mar 2019 09:15:17 +0000
Subject: [PATCH] Revert "API tweaks"

This reverts commit f3e0eb8b0c9e334138b0e663dfb498e34144877b.

Reason for revert: Droid Cop revert this CL due to it cause Cts fail on PermissionPolicyTest.testPlatformPermissionPolicyUnaltered

Change-Id: I062b2b9f25dbf388940930a81fd8e036b82b7f45
---
 api/current.txt                                     |  1 -
 api/system-current.txt                              |  4 ++++
 api/test-current.txt                                |  4 ++++
 core/res/AndroidManifest.xml                        |  4 ++--
 .../android/telecom/PhoneAccountSuggestion.java     | 13 +++++--------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 8ab7b19b70e43..9ebd4b4f18bef 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -41736,7 +41736,6 @@ package android.telecom {
   }
 
   public final class PhoneAccountSuggestion implements android.os.Parcelable {
-    ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
     method public int describeContents();
     method @NonNull public android.telecom.PhoneAccountHandle getPhoneAccountHandle();
     method public int getReason();
diff --git a/api/system-current.txt b/api/system-current.txt
index 46c420a572cdc..fd6a37c135a07 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5412,6 +5412,10 @@ package android.telecom {
     field public static final int CAPABILITY_MULTI_USER = 32; // 0x20
   }
 
+  public final class PhoneAccountSuggestion implements android.os.Parcelable {
+    ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
+  }
+
   public class PhoneAccountSuggestionService extends android.app.Service {
     ctor public PhoneAccountSuggestionService();
     method public void onAccountSuggestionRequest(@NonNull String);
diff --git a/api/test-current.txt b/api/test-current.txt
index 73910254b8504..271f7cbfa8236 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1443,6 +1443,10 @@ package android.telecom {
     method public android.telecom.Connection getPrimaryConnection();
   }
 
+  public final class PhoneAccountSuggestion implements android.os.Parcelable {
+    ctor public PhoneAccountSuggestion(@NonNull android.telecom.PhoneAccountHandle, int, boolean);
+  }
+
   public class PhoneAccountSuggestionService extends android.app.Service {
     ctor public PhoneAccountSuggestionService();
     method public void onAccountSuggestionRequest(@NonNull String);
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 35bc46ae33ab7..e40d97bb1396d 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1839,12 +1839,12 @@
 
     <!-- Must be required by a {@link android.telecom.PhoneAccountSuggestionService},
          to ensure that only the system can bind to it.
-         <p>Protection level: signature
+         <p>Protection level: signature|privileged
          @SystemApi
          @hide
     -->
     <permission android:name="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.telecom.CallRedirectionService},
          to ensure that only the system can bind to it.
diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestion.java b/telecomm/java/android/telecom/PhoneAccountSuggestion.java
index 563c2dc9ee5e5..f23f4c9b9e9e3 100644
--- a/telecomm/java/android/telecom/PhoneAccountSuggestion.java
+++ b/telecomm/java/android/telecom/PhoneAccountSuggestion.java
@@ -18,6 +18,8 @@ package android.telecom;
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.os.Parcel;
 import android.os.Parcelable;
 
@@ -67,15 +69,10 @@ public final class PhoneAccountSuggestion implements Parcelable {
     private boolean mShouldAutoSelect;
 
     /**
-     * Creates a new instance of {@link PhoneAccountSuggestion}. This constructor is intended for
-     * use by apps implementing a {@link PhoneAccountSuggestionService}, and generally should not be
-     * used by dialer apps other than for testing purposes.
-     *
-     * @param handle The {@link PhoneAccountHandle} for this suggestion.
-     * @param reason The reason for this suggestion
-     * @param shouldAutoSelect Whether the dialer should automatically place the call using this
-     *                         account. See {@link #shouldAutoSelect()}.
+     * @hide
      */
+    @SystemApi
+    @TestApi
     public PhoneAccountSuggestion(@NonNull PhoneAccountHandle handle, @SuggestionReason int reason,
             boolean shouldAutoSelect) {
         this.mHandle = handle;