commit 484f8d65f66ee4ae4c5c75234e81054f23b9f96e
author Evan Charlton <evanc@google.com> Fri Jul 18 14:06:58 2014 -0700
committer Evan Charlton <evanc@google.com> Sat Jul 19 14:17:52 2014 -0700
tree da3d688b3e3da9258b485e35c9a014741c5f5def
parent 44b1810b608f2544c3e101af5b48aef6762d1563

Populate subscription number

Populate the subscription number for PhoneAccountMetadata

Bug: 13333595
Change-Id: I0d3b2cfcea08aeba760c392c116303f21beb70d3

src/com/android/telecomm/PhoneAccountRegistrar.java

diff --git a/src/com/android/telecomm/PhoneAccountRegistrar.java b/src/com/android/telecomm/PhoneAccountRegistrar.java
index d089e17..2deb557 100644
--- a/src/com/android/telecomm/PhoneAccountRegistrar.java
+++ b/src/com/android/telecomm/PhoneAccountRegistrar.java
@@ -272,6 +272,7 @@
             new Json<PhoneAccountMetadata>() {
         private static final String ACCOUNT = "account";
         private static final String HANDLE = "handle";
+        private static final String SUBSCRIPTION_NUMBER = "subscription_number";
         private static final String CAPABILITIES = "capabilities";
         private static final String ICON_RES_ID = "icon_res_id";
         private static final String LABEL = "label";
@@ -283,6 +284,7 @@
             return new JSONObject()
                     .put(ACCOUNT, sPhoneAccountJson.toJson(o.getAccount()))
                     .put(HANDLE, o.getHandle().toString())
+                    .put(SUBSCRIPTION_NUMBER, o.getSubscriptionNumber())
                     .put(CAPABILITIES, o.getCapabilities())
                     .put(ICON_RES_ID, o.getIconResId())
                     .put(LABEL, o.getLabel())
@@ -295,6 +297,7 @@
             return new PhoneAccountMetadata(
                     sPhoneAccountJson.fromJson((JSONObject) json.get(ACCOUNT)),
                     Uri.parse((String) json.get(HANDLE)),
+                    (String) json.get(SUBSCRIPTION_NUMBER),
                     (int) json.get(CAPABILITIES),
                     (int) json.get(ICON_RES_ID),
                     (String) json.get(LABEL),

src/com/android/telecomm/TelecommApp.java

diff --git a/src/com/android/telecomm/TelecommApp.java b/src/com/android/telecomm/TelecommApp.java
index fd35708..15e489a 100644
--- a/src/com/android/telecomm/TelecommApp.java
+++ b/src/com/android/telecomm/TelecommApp.java
@@ -84,6 +84,7 @@
                                 "com.google.android.apps.babel.telephony.TeleConnectionService"),
                         "null_id"),
                 Uri.fromParts("tel", "null_uri", null),
+                "650-253-0000",
                 PhoneAccountMetadata.CAPABILITY_CALL_PROVIDER,
                 R.drawable.stat_sys_phone_call,
                 "Wi-Fi calling",

tests/src/com/android/telecomm/testapps/CallServiceNotifier.java

diff --git a/tests/src/com/android/telecomm/testapps/CallServiceNotifier.java b/tests/src/com/android/telecomm/testapps/CallServiceNotifier.java
index 9724ef8..7b48f1f 100644
--- a/tests/src/com/android/telecomm/testapps/CallServiceNotifier.java
+++ b/tests/src/com/android/telecomm/testapps/CallServiceNotifier.java
@@ -91,6 +91,7 @@
                         new ComponentName(context, TestConnectionService.class),
                         "testapps_TestConnectionService_Account_ID"),
                 Uri.parse("tel:555-TEST"),
+                "555-TEST",
                 PhoneAccountMetadata.CAPABILITY_CALL_PROVIDER,
                 0,  // iconResId
                 "a label",