7839 Commits

Author SHA1 Message Date
Wink Saville
cd4fd153ec am 3d122b56: am 65d62c77: Add hasIccCard to IccCard and TelephonyManager.
Merge commit '3d122b56d9bf2a5c63b55bc6a67f56aff8e65b6f'

* commit '3d122b56d9bf2a5c63b55bc6a67f56aff8e65b6f':
  Add hasIccCard to IccCard and TelephonyManager.
2009-09-01 16:14:04 -07:00
jsh
5b462477a9 Fix some sign in errors.
AccountManagerService.SimWatcher was checking if storedImsi = "initial"
instead of null as an initial condition.  Also, on NV-only CDMA devices
we were only sending SIM_STATE_CHANGED notifications when the radio
powered down, which meant storedImsi was only initialized if the radio
powered down.
2009-09-01 16:13:55 -07:00
San Mehat
8ad609bdc0 am 1726b483: am 03a3327b: Merge change 23506 into eclair
Merge commit '1726b4830298e59c5db9509b121cdecbe9b5ae50'

* commit '1726b4830298e59c5db9509b121cdecbe9b5ae50':
  dumpstate: Add support for apanic crash data
2009-09-01 16:13:55 -07:00
Tom Taylor
e387765095 am 0b65eaae: am 513069c3: Make a path constant
Merge commit '0b65eaaeedd36710cf48dd36c016c7ba6ef2a2ff'

* commit '0b65eaaeedd36710cf48dd36c016c7ba6ef2a2ff':
  Make a path constant
2009-09-01 16:13:46 -07:00
Grace Kloba
87a890cd94 am 775745c4: am 9217c458: When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue. We need to pass them to WebViewCore as they are per process base. If we drop them, the counter in the JWebCoreJavaBridge can be out of order.
Merge commit '775745c40c27f1131a98fa2857f061324c6b7709'

* commit '775745c40c27f1131a98fa2857f061324c6b7709':
  When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
2009-09-01 16:13:17 -07:00
Andreas Huber
43ad6eaf77 Squashed commit of the following:
commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:58:12 2009 -0700

    This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:55:45 2009 -0700

    Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

    This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:16:23 2009 -0700

    The AAC components appear to output stereo data even if the input data is mono...
2009-09-01 16:02:43 -07:00
Dmitri Plotnikov
b5759b5f4f Adding a convenience method to resolve contact lookup URI to a regular content URI 2009-09-01 15:58:40 -07:00
Wink Saville
3d122b56d9 am 65d62c77: Add hasIccCard to IccCard and TelephonyManager.
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp

* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
  Add hasIccCard to IccCard and TelephonyManager.
2009-09-01 15:58:10 -07:00
Wink Saville
65d62c774e Add hasIccCard to IccCard and TelephonyManager.
Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.

The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.

Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
2009-09-01 15:52:42 -07:00
San Mehat
1726b48302 am 03a3327b: Merge change 23506 into eclair
Merge commit '03a3327badda54728de2ca969b31b53f5ad9ad3a' into eclair-plus-aosp

* commit '03a3327badda54728de2ca969b31b53f5ad9ad3a':
  dumpstate: Add support for apanic crash data
2009-09-01 15:42:30 -07:00
Android (Google) Code Review
03a3327bad Merge change 23506 into eclair
* changes:
  dumpstate: Add support for apanic crash data
2009-09-01 15:40:28 -07:00
Tom Taylor
0b65eaaeed am 513069c3: Make a path constant
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp

* commit '513069c39cd6610db2919c09abea2ff73158356a':
  Make a path constant
2009-09-01 15:30:34 -07:00
Tom Taylor
513069c39c Make a path constant
Add a constant for the new locked uri.

Change-Id: I3bad24ac7ee806442bdd5e38be61005f081edf0d
2009-09-01 15:26:49 -07:00
Eric Fischer
c87d25215c Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing.  Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation.  (And fix a recently-introduced string
that has exactly this problem.)

Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.

Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
2009-09-01 15:20:30 -07:00
Grace Kloba
775745c40c am 9217c458: When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue. We need to pass them to WebViewCore as they are per process base. If we drop them, the counter in the JWebCoreJavaBridge can be out of order.
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp

* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
  When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
2009-09-01 15:02:34 -07:00
Grace Kloba
9217c45829 When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
We need to pass them to WebViewCore as they are per process base. If we drop
them, the counter in the JWebCoreJavaBridge can be out of order.

Part 2 of fixing http://b/issue?id=2087410
2009-09-01 14:58:10 -07:00
San Mehat
30b9f57c8b dumpstate: Add support for apanic crash data
Signed-off-by: San Mehat <san@google.com>
2009-09-01 14:41:13 -07:00
Lixin Yue
635a7f8e7c am 8a61df64: am 485e6dca: Merge change 23462 into eclair
Merge commit '8a61df6410fb371f527c0f18c6e85c7ca6d84d8a'

* commit '8a61df6410fb371f527c0f18c6e85c7ca6d84d8a':
  Add Bluetooth Device trust
2009-09-01 14:13:37 -07:00
Lixin Yue
8a61df6410 am 485e6dca: Merge change 23462 into eclair
Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp

* commit '485e6dca960c2001349de0817c644f24ae85c6e3':
  Add Bluetooth Device trust
2009-09-01 14:11:53 -07:00
Android (Google) Code Review
485e6dca96 Merge change 23462 into eclair
* changes:
  Add Bluetooth Device trust
2009-09-01 14:10:06 -07:00
jsh
203eddb849 am 3b8916c2: am a01726a7: Some fixes to SMS processing in the framework.
Merge commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5'

* commit '3b8916c25bd56e4847f57bf8286542bbe50c84d5':
  Some fixes to SMS processing in the framework.
2009-09-01 13:59:54 -07:00
Evan Millar
00b7d0cd72 am ac7d821d: am 394c92ef: Merge change 23461 into eclair
Merge commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d'

* commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:59:41 -07:00
Dmitri Plotnikov
251929cc90 am ec6b9406: am 6ff270fd: Merge change 23474 into eclair
Merge commit 'ec6b9406593ba44f3e21ebdb5516301e12ebcee6'

* commit 'ec6b9406593ba44f3e21ebdb5516301e12ebcee6':
  Breaking sleep after yield into small quanta.
2009-09-01 13:59:33 -07:00
Dianne Hackborn
7004a65fe3 am 93ca790c: am d31825c6: Merge change 23403 into eclair
Merge commit '93ca790c025d51780bff9be42cffdd0055091edb'

* commit '93ca790c025d51780bff9be42cffdd0055091edb':
  Various infrastructure to support a running services UI.
2009-09-01 13:59:24 -07:00
Guang Zhu
b23259e1c7 am 84aa88a9: am 87b455f5: Merge change 23469 into eclair
Merge commit '84aa88a93b4528d38892a48c835e96a35ced9233'

* commit '84aa88a93b4528d38892a48c835e96a35ced9233':
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 13:59:10 -07:00
Daniel Sandler
99135d20c0 am 8a6129d5: am 0c91f5a3: Merge change 23464 into eclair
Merge commit '8a6129d549dae5836ac5e9065bba9edd02fbdb92'

* commit '8a6129d549dae5836ac5e9065bba9edd02fbdb92':
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 13:58:49 -07:00
Lixin Yue
efa1dd716d Add Bluetooth Device trust 2009-09-01 13:58:31 -07:00
Dianne Hackborn
da706900f4 Fix content provider 2009-09-01 13:57:11 -07:00
Jean-Baptiste Queru
1ffc20b948 manual merge of 85a2c7f because of trivial conflict 2009-09-01 13:52:19 -07:00
Jean-Michel Trivi
3218471bcd Modify the gain after filtering to prevent TTS clipping in en-US. 2009-09-01 13:46:43 -07:00
jsh
3b8916c25b am a01726a7: Some fixes to SMS processing in the framework.
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp

* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
  Some fixes to SMS processing in the framework.
2009-09-01 13:40:15 -07:00
jsh
a01726a7fd Some fixes to SMS processing in the framework.
Always process class 0 and other unstored SMS (eg, MWI).  We were
rejecting all SMS messages in storage full situations, but certain
messages do not require storage.

Also, notify apps when the framework rejects MT SMS, with new
SMS_REJECTED_ACTION intent.

b/2066775
b/2015906
2009-09-01 13:35:20 -07:00
Evan Millar
ac7d821d1a am 394c92ef: Merge change 23461 into eclair
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp

* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:10:35 -07:00
Android (Google) Code Review
394c92ef15 Merge change 23461 into eclair
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:09:25 -07:00
Dmitri Plotnikov
ec6b940659 am 6ff270fd: Merge change 23474 into eclair
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp

* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
  Breaking sleep after yield into small quanta.
2009-09-01 13:06:04 -07:00
Android (Google) Code Review
6ff270fd85 Merge change 23474 into eclair
* changes:
  Breaking sleep after yield into small quanta.
2009-09-01 13:03:58 -07:00
Dianne Hackborn
93ca790c02 am d31825c6: Merge change 23403 into eclair
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp

* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
  Various infrastructure to support a running services UI.
2009-09-01 12:33:07 -07:00
Android (Google) Code Review
d31825c6ff Merge change 23403 into eclair
* changes:
  Various infrastructure to support a running services UI.
2009-09-01 12:31:31 -07:00
Eric Fischer
334ef5484b am f84b8034: am b7559e02: am 56205fea: Merge change 23345 into donut
Merge commit 'f84b803478eeb3ce34da55f242d9b9685c6c943d'

* commit 'f84b803478eeb3ce34da55f242d9b9685c6c943d':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 12:16:01 -07:00
Eric Laurent
554df60ae2 am 0d71db49: am 46c15823: Merge change 23105 into eclair
Merge commit '0d71db4979426c20972e5c1c4488fbf27c3b2863'

* commit '0d71db4979426c20972e5c1c4488fbf27c3b2863':
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 12:15:53 -07:00
Guang Zhu
a1d6ebefe3 am b21ca4bd: am d9942b5c: Merge change 23450 into eclair
Merge commit 'b21ca4bd11e672004dc87ced0c8381d052993835'

* commit 'b21ca4bd11e672004dc87ced0c8381d052993835':
  At leaset log the layout test timeouts
2009-09-01 12:15:30 -07:00
Cary Clark
44544ab571 am 1b0f6e82: am 169ae05f: Merge change 23439 into eclair
Merge commit '1b0f6e82f6b4e34109117b77db156cd53da1be94'

* commit '1b0f6e82f6b4e34109117b77db156cd53da1be94':
  if exception getMessage() is null, don't add it to the error
2009-09-01 12:15:22 -07:00
Eric Laurent
dc4dbcfa6b am 9af39a57: am b51b4098: Merge change 23438 into eclair
Merge commit '9af39a5700e6a77b74b87e8739be1dd3c7b668d8'

* commit '9af39a5700e6a77b74b87e8739be1dd3c7b668d8':
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 12:15:16 -07:00
Grace Kloba
27c30a7776 am 75e05a5d: am 5e2a385c: Merge change 23395 into eclair
Merge commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d'

* commit '75e05a5dbbbb75bb8e1b8f0fb3ff52c7baa8968d':
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
2009-09-01 12:14:49 -07:00
Evan Millar
b3c4998284 Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
This is necessary partly for general hygiene, but mostly because we need
to be able to determine based on the intent type what style URI to
return in the case of startActivityForResult().

Change-Id: Ib313d830b8646a70d5ac3ded11597af614429262
2009-09-01 12:14:12 -07:00
Dmitri Plotnikov
600bdd82f5 Breaking sleep after yield into small quanta.
Rationale: there is no reason to sleep for 4 seconds between
transactions if there is no one using the database.  This long
sleep only makes sense if two threads are actively using 
the database yielding to each other every several seconds.
2009-09-01 12:12:20 -07:00
Guang Zhu
84aa88a93b am 87b455f5: Merge change 23469 into eclair
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp

* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 12:05:47 -07:00
Android (Google) Code Review
87b455f558 Merge change 23469 into eclair
* changes:
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 12:03:39 -07:00
Guang Zhu
f3d924ca0d Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback. 2009-09-01 11:57:16 -07:00
Daniel Sandler
8a6129d549 am 0c91f5a3: Merge change 23464 into eclair
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp

* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:51:53 -07:00