Store the current country in call log

Change-Id: Ia68f8e0280b89d5993abb2701a3c425a147b51ba

core/java/android/provider/CallLog.java

@@ -87,6 +87,17 @@ public class CallLog {
          */
         public static final String NUMBER = "number";
 
+        /**
+         * The ISO 3166-1 two letters country code of the country where the
+         * user received or made the call.
+         * <P>
+         * Type: TEXT
+         * </P>
+         *
+         * @hide
+         */
+        public static final String COUNTRY_ISO = "countryiso";
+
         /**
          * The date the call occured, in milliseconds since the epoch
          * <P>Type: INTEGER (long)</P>

core/java/android/provider/ContactsContract.java

@@ -3301,6 +3301,14 @@ public final class ContactsContract {
          * <P>Type: TEXT</P>
          */
         public static final String LABEL = "label";
+
+        /**
+         * The phone number's E164 representation.
+         * <P>Type: TEXT</P>
+         *
+         * @hide
+         */
+        public static final String NORMALIZED_NUMBER = "normalized_number";
     }
 
     /**
@@ -4152,6 +4160,14 @@ public final class ContactsContract {
              */
             public static final String NUMBER = DATA;
 
+            /**
+             * The phone number's E164 representation.
+             * <P>Type: TEXT</P>
+             *
+             * @hide
+             */
+            public static final String NORMALIZED_NUMBER = DATA4;
+
             /**
              * @deprecated use {@link #getTypeLabel(Resources, int, CharSequence)} instead.
              * @hide