79762 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
0be33f2d52 Merge "Add shortcut to avoid potential divide by zero in some case" 2012-08-08 13:17:26 -07:00
Jean-Baptiste Queru
9ab84c203f Merge "Fix wrong count return for getPhoneSignalStrengthCount" 2012-08-08 12:59:06 -07:00
Jean-Baptiste Queru
6fb8fe9aba Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 2012-08-08 12:06:26 -07:00
Jean-Baptiste Queru
52410be8ec Merge "mediacodec: Don't suggest calling getOutputFormat() immediately" 2012-08-08 12:06:03 -07:00
Jean-Baptiste Queru
e67f8c8c27 Merge "Normalize output from aapt d xmltree" 2012-08-08 11:21:29 -07:00
Jean-Baptiste Queru
d77d17c28d Merge "Fix cursor memory leak" 2012-08-08 10:44:50 -07:00
Jean-Baptiste Queru
2278e60c39 Merge "Adds missing Bluetooth as network type." 2012-08-08 10:43:20 -07:00
Elliott Hughes
33c5670b31 Merge "Fewer warnings in aidl generated code." 2012-08-07 12:19:22 -07:00
Elliott Hughes
b327c41e12 Fewer warnings in aidl generated code.
Bug: http://code.google.com/p/android/issues/detail?id=19196
Change-Id: If054e60c19dc73fe32f55d0fa1054309565a6de6
2012-08-07 10:34:02 -07:00
Wink Saville
98853623bc Merge "Telephony: Move AdnRecord.aidl into opt/telephony" 2012-08-04 07:54:35 -07:00
Wink Saville
e20a19cb54 Merge "show 3G icon for CDMA/1xRTT" 2012-08-04 07:51:27 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
2012-08-03 16:47:51 -07:00
Madan Ankapura
68cad3a0fa show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device

Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
2012-08-02 19:10:22 -07:00
Brian Carlstrom
d2237dfe7d Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" 2012-08-01 16:30:54 -07:00
Brian Carlstrom
2a5b147ec8 Change KeyStore to use Modified UTF-8 to match NativeCrypto
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
2012-08-01 15:44:52 -07:00
Brian Carlstrom
4faeef378e Merge "Improve test key names to reproduce public issue" 2012-08-01 15:06:35 -07:00
Robert Greenwalt
a5637bac23 Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName" 2012-08-01 11:01:21 -07:00
Adam Powell
2ffb1acbb7 Merge " Fix preload classname for phone policy." 2012-07-30 10:46:12 -07:00
Brian Carlstrom
5ea68db37f Improve test key names to reproduce public issue
Also fixes other unrelated test failures.

Bug: http://code.google.com/p/android/issues/detail?id=34577
Bug: 6837950

(cherry-picked from f4019af04a1fc4b16aa5972cbcbba703caa5d78d)

Change-Id: I5b32b5ccac80f04a4d0fd6b21b8caa11e42995a7
2012-07-27 22:41:42 -07:00
Romain Guy
dfac68eacc Merge "Corrected typo when checking InputStream methods" 2012-07-27 13:58:12 -07:00
Edward Savage-Jones
8ac41bb79e Corrected typo when checking InputStream methods
Corrected a small typo where Java InputStream methods are
incorrectly checked when creating a JNI InputStream adaptor.

Change-Id: I5f14897e0d5ddceb4b2af6be46769713f0487624
2012-07-27 15:14:24 +02:00
Naveen Kalla
897b311ccb Telephony: Add HSPAP to getTcpBufferSizesPropName
When device is camped on HSPAP TCP Buffer sizes need to be configured
properly to support higher data rates. Without this change, default TCP
buffer sizes will be used and throughput will be low.

Change-Id: Ica5884b35851a32e57c82c63b148df5be580ae83
2012-07-26 00:07:20 -07:00
Chen YANG
0412cfcbcd Add shortcut to avoid potential divide by zero in some case
Change-Id: If4b34c95402daf8ebcc28736edfb2012553aa57c
2012-07-25 14:19:29 +08:00
Nick Kralevich
2c932143ff Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks" 2012-07-19 16:25:42 -07:00
Jake Hamby
06d3df9aa0 Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony" 2012-07-19 15:30:02 -07:00
Naveen Kalla
93cb0dd3b2 Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
This test was missed out while migrating telephony to frameworks/opt.

Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
2012-07-18 14:51:11 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-17 12:23:09 -07:00
Catherine Liu
fb90081351 Fix wrong count return for getPhoneSignalStrengthCount
Test report for the time spent in each signal strength bin, along
with the number of times that bin was entered showed the result
as Bin=3 Time=3211926000 Count=0. With a non-zero Time, the Count
value 0 was wrong.

The cause of the problem was that getPhoneSignalStrengthCount() used
mPhoneDataConnectionsTimer, instead of mPhoneSignalStrengthsTimer,
to get the count.

Change-Id: I55ac1125abfcfdc105605d76d1c706ac315b90cc
2012-07-17 14:12:56 -05:00
Elliott Hughes
3c04cc44c4 Merge "Don't talk about Froyo as if it's still in the future." 2012-07-16 15:40:25 -07:00
Elliott Hughes
79d95ac74e Don't talk about Froyo as if it's still in the future.
Change-Id: I40c26a7a27459f7e8dd51c9f03fa860dee3a3a02
2012-07-16 15:30:53 -07:00
Romain Guy
8d1704215e Merge "Fix wrong condition." 2012-07-16 00:57:42 -07:00
SeongJae Park
8108e9f8cd Fix wrong condition.
Should check width and height, not width and width.

Change-Id: Ie84d3605b2a7a0f4776adb876608ea92f56817c4
2012-07-14 14:18:51 +09:00
Martin Storsjo
fdd3241a24 mediacodec: Don't suggest calling getOutputFormat() immediately
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
2012-07-13 14:10:21 +03:00
Qi Wang
097fbf2e98 StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM) 2012-07-13 09:26:03 +08:00
Joshua Brindle
365861e3aa s/LOG/ALOG/ in HAVE_SELINUX blocks
The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.

Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
2012-07-10 11:02:01 -04:00
Håkan3 Johansson
011238bd8d Adds missing Bluetooth as network type.
The network connection type for Bluetooth is added so
that it is possible to use Bluetooth as Hotspot during
download from the Internet.

Change-Id: If8e8a3f69821beef742bc91d7a292a091861b48b
2012-07-10 15:03:54 +02:00
Catherine Liu
3f824c0e72 Fix cursor memory leak
In current code, if an application opens a cursor to access a
provider, and doesn't close that cursor, later, when this cursor
is garbage collected, it won't get closed. This will cause a memory
leak in the provider. The leaked memory can only be reclaimed when
the application with the leaked cursor was dead.

The solution is, close the cursor when it's garbage collected.

Change-Id: I786915c46d4672b6b1b37414b3bc1ff8cea2e00b
2012-07-09 16:34:58 -05:00
Shachar Shemesh
429dad687b Normalize output from aapt d xmltree
When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a
newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and
what is the meta-data.

We now pass XML content through the same normalizer used for other tags.

Change-Id: I327321520fac563eb32aecaf796f2473866697fc
2012-07-08 06:37:48 +03:00
Romain Guy
13a3a87fa7 am dc99555d: Merge "Pass SearchView suggestion cursor exception to Log."
* commit 'dc99555d61d50820b398096bb774ee56b2500476':
  Pass SearchView suggestion cursor exception to Log.
2012-07-06 23:52:55 -07:00
Romain Guy
dc99555d61 Merge "Pass SearchView suggestion cursor exception to Log." 2012-07-06 23:18:19 -07:00
Jake Wharton
73af451694 Pass SearchView suggestion cursor exception to Log.
When an error in fetching a column occurs in your suggestions cursor
adapter this will ensure the stacktrace is logged to provide more
context about what failed.

Change-Id: Iafe4918caebb9b0fb712b758b2d3ace329fd2512
2012-07-06 23:15:49 -07:00
Scott Main
d5f7d9b59d am 15796e52: Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev
* commit '15796e52df1626ae27a6a88c6e905fd3b80868c9':
  docs: add largeHeap attribute to app manifest doc external issue 33967
2012-07-03 19:41:56 -07:00
Scott Main
15796e52df Merge "docs: add largeHeap attribute to app manifest doc external issue 33967" into jb-dev 2012-07-03 19:39:26 -07:00
Scott Main
31f38d692c am e469e74f: docs: new sitemap text file
* commit 'e469e74fd339efcfe88b56780f4380b0d1dd2ce8':
  docs: new sitemap text file
2012-07-03 19:32:42 -07:00
Scott Main
e469e74fd3 docs: new sitemap text file
Change-Id: Ia28407054216997126873bb855d55c9caeeb05b4
2012-07-03 19:29:45 -07:00
Scott Main
01e1b832d7 docs: add largeHeap attribute to app manifest doc
external issue 33967

Change-Id: I69e5d3da78098842c4710708f4d389637dd0fe6b
2012-07-03 18:21:00 -07:00
Scott Main
480785dabb am fd516987: docs: misc bugs from external tracker
* commit 'fd516987de29a48425da5ee5aace5be40adcc674':
  docs: misc bugs from external tracker
2012-07-03 18:15:19 -07:00
Scott Main
fd516987de docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
2012-07-03 18:08:19 -07:00
Scott Main
7b5488d85d am 099fd80f: docs: add throws notice for isPlaying per external issue 33610
* commit '099fd80f984b8493de58bdda8ea05563261b0af2':
  docs: add throws notice for isPlaying per external issue 33610
2012-07-03 17:39:25 -07:00
Scott Main
099fd80f98 docs: add throws notice for isPlaying
per external issue 33610

Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
2012-07-03 17:32:23 -07:00