commit 1e44acb566c56e948176be14f54b7cc9bd672e44
author Tyler Gunn <tgunn@google.com> Tue Nov 13 10:06:16 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 13 10:06:16 2018 -0800
tree df0e2fbc8baddddd17be6bfe3ea5747c93e383ee
parent f03be92220a9846f7609b8ac9c4fb16c0f4cc304
parent b9cdc48c1f464461542ddb8a101e10bf13337c2d

Merge "Expose capabilitiesToString for use in Telecom." am: b7d9e55bc7
am: b9cdc48c1f

Change-Id: Ib35d4013fe5f7e7a1a34d9e74eae1b7e642f0a26

telecomm/java/android/telecom/PhoneAccount.java

diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index 9a4ea9e7..2ffad03 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -985,10 +985,10 @@
     /**
      * Generates a string representation of a capabilities bitmask.
      *
-     * @param capabilities The capabilities bitmask.
      * @return String representation of the capabilities bitmask.
+     * @hide
      */
-    private String capabilitiesToString() {
+    public String capabilitiesToString() {
         StringBuilder sb = new StringBuilder();
         if (hasCapabilities(CAPABILITY_SELF_MANAGED)) {
             sb.append("SelfManaged ");