Jeff Hamilton
4b3309211e
Don't crash when low storage is encountered pre-boot completion.
...
Bug: 2741633
Change-Id: Ic073ead64ff43b2e2c32b439756cd71c2b6550b8
2010-06-04 15:16:06 -05:00
Robert Greenwalt
77b32ddbbe
Make the DUN apn data secure.
...
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).
Also made the "require-dun" setting secure-setting overridable.
bug:2736390
Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
2010-06-04 11:13:34 -07:00
The Android Open Source Project
2d743fe2f3
merge from open-source master
...
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
2010-06-04 11:08:36 -07:00
Andreas Huber
e896d41699
am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
...
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:30:03 -07:00
Andreas Huber
2e3761ba43
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
2010-06-03 15:28:13 -07:00
Andreas Huber
3c460f3da0
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
...
Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
2010-06-03 14:43:57 -07:00
Romain Guy
fb59fbf14e
Merge "Add better error handling for savePicture and restorePicture"
2010-06-03 14:26:21 -07:00
Dirk Dougherty
b85a1679a4
am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
...
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
2010-06-03 12:58:35 -07:00
Dirk Dougherty
85a1c57830
Merge "Doc change: Adjust security sandbox description." into froyo
2010-06-03 12:57:06 -07:00
James Dong
c40209ac60
am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:27:19 -07:00
James Dong
28a92b2e76
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:26:09 -07:00
James Dong
9d96354d70
Fix a Javadoc to clarify when setAudioStreamType() should be called.
...
bug - 2737926
Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
2010-06-03 10:37:28 -07:00
The Android Open Source Project
ee7e6a78e2
merge from open-source master
...
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00
Dirk Dougherty
5bacbfd39b
Doc change: Adjust security sandbox description.
...
Change-Id: I7b2f530afe65fe0abe6c66e69c9abddcfbc5ae9c
2010-06-02 16:53:00 -07:00
Erik Faye-Lund
92ce5734b5
Canvas.drawVertices: correct color range-check
...
The range-check in drawVertices previously checked that the color
count was equal to the vertex count. However, the vertex count is
specified in array elements, and there's two array elements per
vertex for the positions, but only one array element per vertex
for the colors.
Correct the code so the check is consistent with the element count.
Change-Id: Id043f1003f9245f18adc91bac49dc33727ca765e
2010-06-02 23:47:01 +02:00
Scott Main
105e1c5adc
am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
...
Merge commit '6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes
2010-06-02 13:44:44 -07:00
Scott Main
6a29711872
Merge "docs: a couple doc bug fixes" into froyo
2010-06-02 13:43:18 -07:00
Scott Main
20a7612504
docs: a couple doc bug fixes
...
Change-Id: I37b2adf9d30249eb9c0cbb007d9172d3956421b5
2010-06-02 13:01:49 -07:00
The Android Open Source Project
1bd7597b8c
merge from open-source master
...
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
2010-06-02 08:54:47 -07:00
The Android Open Source Project
c8763858cf
merge from open-source master
...
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
2010-06-02 08:41:59 -07:00
Mathias Palmqvist
8999515f66
Use stride for source and target buffers when copybit is enabled.
...
Change-Id: Ie651013b3522f8e004685d74190da86433086307
2010-06-02 16:03:04 +02:00
John Eckerdal
dad86349be
Add better error handling for savePicture and restorePicture
...
If an Exception occurs when storing the file treat this as an error
and always fail to try to prevent corrupted pictures to be stored to
the file system.
Close files if they were opened, the caller might want to perform other
file operations on the file and if it is still open these may fail.
Change-Id: Ic68596b5c745bbe413096c22684c388e853a7643
2010-06-02 10:59:46 +02:00
Kenny Root
e99c012503
Merge "Improved error-handling in Rfc822Tokenizer"
2010-06-01 22:56:39 -07:00
Dirk Dougherty
8799cdfb01
am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
...
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:45:24 -07:00
Dirk Dougherty
de56c27dab
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
2010-06-01 15:44:02 -07:00
Dirk Dougherty
920bd3a0f4
Doc change: rename slide decks for sorting by year then quarter.
...
Change-Id: I77b60f2e38915eae1a23e3c78a2260eacc33c117
2010-06-01 14:34:28 -07:00
Dan Egnor
1f5e847350
am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
...
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
2010-06-01 14:28:46 -07:00
Dan Egnor
a80331c4d7
Merge "Comment-only change to add documentation for FileObserver" into froyo
2010-06-01 14:09:20 -07:00
Dirk Dougherty
bce5edaf46
am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
...
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
2010-06-01 11:07:56 -07:00
Dirk Dougherty
862ad0e524
Merge "Doc change: updated dashboards stats." into froyo
2010-06-01 11:04:20 -07:00
Dirk Dougherty
3a206bc562
Doc change: updated dashboards stats.
...
Change-Id: Id86dcc432d81fa4154995211d3e65a7c3366814e
2010-06-01 09:53:52 -07:00
Christian Mehlmauer
ef367529f9
Replaced raw string arguments for Context.getSystemService() with final Context variables
...
Change-Id: If5139a1526101292e5da557bfad3f4db80fb64a8
2010-05-31 23:08:30 +02:00
Dan Egnor
3dc1c7f5e8
Comment-only change to add documentation for FileObserver
...
Change-Id: Icd9bc65be020a23f78c8bcda78fc68e7d05c93b4
2010-05-31 12:17:12 -07:00
Christopher Tate
5c9d99496d
am 6ee412d5: Also dump system process threads halfway through the watchdog interval
...
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
2010-05-28 12:50:05 -07:00
Christopher Tate
6ee412d51d
Also dump system process threads halfway through the watchdog interval
...
This gives us a snapshot of what the system process was doing after 30 seconds
of apparent inactivity as well as after 1 minute, to help distinguishing actual
deadlocks from too-slow progress, livelock, etc.
Change-Id: I19758861d1b25f298e88788e8f1c7ec7bf828823
2010-05-28 12:23:16 -07:00
Kenny Root
6cc137459a
am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
...
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
9eae957207
am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
...
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:35:18 -07:00
Kenny Root
94f1751cb0
Merge "Fix typo in EastAsianWidth javadoc" into froyo
2010-05-27 12:04:34 -07:00
Dirk Dougherty
9f95c64e66
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
2010-05-27 11:46:26 -07:00
Dirk Dougherty
a1d25f60c3
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
...
Change-Id: I5ff67605829b4fc09263d56a76aefe57f40783fd
2010-05-27 10:01:48 -07:00
Jeff Hamilton
edf228ce1f
am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
...
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
dc46f6f6cc
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
2010-05-27 09:39:19 -07:00
Kenny Root
18b221af46
Fix typo in EastAsianWidth javadoc
...
The Javadoc had a missing close <code> tag and also failed to mention
the "start" parameter in the doc.
Change-Id: I861d6646e82e1d49f23a09de8b68a61f81689f83
2010-05-27 06:41:59 -07:00
Irfan Sheriff
8316e875ba
am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
2010-05-26 21:34:52 -07:00
Irfan Sheriff
b3f3caef38
Merge "Fix null pointer exception" into froyo
2010-05-26 21:32:29 -07:00
Dirk Dougherty
f69fd4dd48
am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:33:05 -07:00
Dirk Dougherty
4273ce19bf
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:31:38 -07:00
Dirk Dougherty
0f3abfb5c0
Doc change: Suggest min keysize of 2048 for keys.
...
Change-Id: I6dcfe9aa12338e4ad71db2e6812ce387a75c09f0
2010-05-26 17:34:09 -07:00
Irfan Sheriff
7baec0fe4e
Fix null pointer exception
...
Bug: 2718857
Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
2010-05-26 17:16:47 -07:00
Dirk Dougherty
81800015af
am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
...
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp
* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
Doc change: fix adt download page, misc doc fixes.
2010-05-26 16:51:12 -07:00