commit f070a9579f52b73d56358c60164d05c0047d0ffd
author Tom Taylor <tomtaylor@google.com> Tue Nov 04 19:04:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 04 19:05:00 2014 +0000
tree 0713bfb7f27eed2204810a47904650fda3bb4e8a
parent f5b56e3917acfeebae8aa6f6a2583cb534437383
parent 1ad5f913c2836e5a76e21adbeb194b060a4625e2

Merge "The sub_id column in the carriers should be an INTEGER instead of a LONG" into lmp-mr1-dev

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 1d66192..5c7948f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -194,7 +194,7 @@
                     + SubscriptionManager.NAME_SOURCE + " INTEGER DEFAULT " + SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE + ","
                     + SubscriptionManager.COLOR + " INTEGER DEFAULT " + SubscriptionManager.COLOR_DEFAULT + ","
                     + SubscriptionManager.NUMBER + " TEXT,"
-                    + SubscriptionManager.DISPLAY_NUMBER_FORMAT + " INTEGER NOT NULL DEFAULT " + SubscriptionManager.DISLPAY_NUMBER_DEFAULT + ","
+                    + SubscriptionManager.DISPLAY_NUMBER_FORMAT + " INTEGER NOT NULL DEFAULT " + SubscriptionManager.DISPLAY_NUMBER_DEFAULT + ","
                     + SubscriptionManager.DATA_ROAMING + " INTEGER DEFAULT " + SubscriptionManager.DATA_ROAMING_DEFAULT + ","
                     + SubscriptionManager.MCC + " INTEGER DEFAULT 0,"
                     + SubscriptionManager.MNC + " INTEGER DEFAULT 0"