From 61c082603fe2bc192606407c9dda2a81d92d44c5 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Tue, 13 Oct 2009 13:53:22 -0700 Subject: [PATCH 1/3] Futher reduce the logging of EriManager. There was another log statement that was poluting radio logs. bug: 2180891 --- .../java/com/android/internal/telephony/cdma/EriManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/com/android/internal/telephony/cdma/EriManager.java b/telephony/java/com/android/internal/telephony/cdma/EriManager.java index 9b23cdffb66f5..083fa0b3d614a 100644 --- a/telephony/java/com/android/internal/telephony/cdma/EriManager.java +++ b/telephony/java/com/android/internal/telephony/cdma/EriManager.java @@ -288,7 +288,7 @@ public final class EriManager { if (isEriFileLoaded) { EriInfo eriInfo = getEriInfo(roamInd); if (eriInfo != null) { - if (DBG) Log.d(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); + if (VDBG) Log.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); ret = new EriDisplayInformation( eriInfo.mIconIndex, eriInfo.mIconMode, From a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 13 Oct 2009 16:28:36 -0700 Subject: [PATCH 2/3] Correct non-opaque list separator assets. Fixes http://b/2186076 --- .../drawable-hdpi/divider_horizontal_dark.9.png | Bin 118 -> 153 bytes .../drawable-mdpi/divider_horizontal_dark.9.png | Bin 121 -> 157 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/core/res/res/drawable-hdpi/divider_horizontal_dark.9.png b/core/res/res/drawable-hdpi/divider_horizontal_dark.9.png index 30a68d0dc87af08674382cf1399716978c5e09c2..338d840c94d6cf8d2458a62680f1cbfa28544dd5 100644 GIT binary patch delta 123 zcmXS$$v8o!l(9I--HBn{IhmIX3=C{Z-tI08|3PrU-sO{lBAf*tk;M!Q+`=Ht$S`Y; z1W=H@#M9T6{U#T$xQJMj&WBS#AxTdc#}JO|$q5Y&|9K3K{r~^JH;_dF2pHNe*>$I< SUE>BSV(@hJb6Mw<&;$V2za+~5 delta 88 zcmbQqST;c=NV3E=q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHbWU37V1A~O8i(^Q| rt)zs8hW|VUYyut&IT|<`7?>Ga%h^RVv;1BF)i8Lv`njxgN@xNAC1D&J diff --git a/core/res/res/drawable-mdpi/divider_horizontal_dark.9.png b/core/res/res/drawable-mdpi/divider_horizontal_dark.9.png index 548d0bd663ad5a75bc625012192b6cac688b606f..bf45e38f0744241d2b5bc98051b2aa942107f2d0 100644 GIT binary patch delta 127 zcmb=N%Q!)$lCe0*-HBn{IhmIX3=C{Z-tI08|3PrU-sO{lBAf*tk;M!Q+`=Ht$S`Y; z1W=H@#M9T6{U#T$xUg!`UUq4qkgTVRV+hA}-;)a&85lSYDAaxWe>=_4! Date: Tue, 13 Oct 2009 18:08:25 -0700 Subject: [PATCH 3/3] Making new Contacts APIs visible in Eclair SDK Bug: http://b/2186595 Change-Id: Iaba8514276299504af6ab0714577eb37d9608237 --- api/current.xml | 1055 +++++++++++++++++ .../android/provider/ContactsContract.java | 26 +- 2 files changed, 1068 insertions(+), 13 deletions(-) diff --git a/api/current.xml b/api/current.xml index ca2cceb52a7f1..e9f13ba733cc3 100644 --- a/api/current.xml +++ b/api/current.xml @@ -112806,6 +112806,58 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Type: INTEGER

@@ -214,7 +214,7 @@ public final class ContactsContract { public static final String SEND_TO_VOICEMAIL = "send_to_voicemail"; } - private interface ContactsColumns { + protected interface ContactsColumns { /** * The display name for the contact. *

Type: TEXT

@@ -247,7 +247,7 @@ public final class ContactsContract { public static final String LOOKUP_KEY = "lookup"; } - private interface ContactStatusColumns { + protected interface ContactStatusColumns { /** * Contact presence status. See {@link StatusUpdates} for individual status * definitions. @@ -540,7 +540,7 @@ public final class ContactsContract { } } - private interface RawContactsColumns { + protected interface RawContactsColumns { /** * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} that this * data belongs to. @@ -699,7 +699,7 @@ public final class ContactsContract { } } - private interface StatusColumns extends Im.CommonPresenceColumns { + protected interface StatusColumns extends Im.CommonPresenceColumns { /** * Contact's latest presence level. *

Type: INTEGER (one of the values below)

@@ -739,7 +739,7 @@ public final class ContactsContract { public static final String STATUS_ICON = "status_icon"; } - private interface DataColumns { + protected interface DataColumns { /** * The package name to use when creating {@link Resources} objects for * this data row. This value is only designed for use when building user @@ -826,7 +826,7 @@ public final class ContactsContract { /** * Combines all columns returned by {@link Data} table queries. */ - private interface DataColumnsWithJoins extends BaseColumns, DataColumns, StatusColumns, + protected interface DataColumnsWithJoins extends BaseColumns, DataColumns, StatusColumns, RawContactsColumns, ContactsColumns, ContactOptionsColumns, ContactStatusColumns { } @@ -938,7 +938,7 @@ public final class ContactsContract { public static final String DATA_ID = "data_id"; } - private interface PhoneLookupColumns { + protected interface PhoneLookupColumns { /** * The phone number as the user entered it. *

Type: TEXT

@@ -986,7 +986,7 @@ public final class ContactsContract { * Additional data mixed in with {@link StatusColumns} to link * back to specific {@link ContactsContract.Data#_ID} entries. */ - private interface PresenceColumns { + protected interface PresenceColumns { /** * Reference to the {@link Data#_ID} entry that owns this presence. @@ -1123,7 +1123,7 @@ public final class ContactsContract { /** * Columns common across the specific types. */ - private interface CommonColumns extends BaseTypes { + protected interface CommonColumns extends BaseTypes { /** * The data for the contact method. *

Type: TEXT

@@ -1930,7 +1930,7 @@ public final class ContactsContract { } } - private interface GroupsColumns { + protected interface GroupsColumns { /** * The display title of this group. *