Romain Guy
6ed3b01104
am b7819f74: am e0f9e735: am 89d4e2dd: Fix the buid!
2010-03-29 15:17:09 -07:00
Romain Guy
b741169d7e
am 2aba9b1e: am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
2010-03-29 15:14:13 -07:00
Romain Guy
b7819f7441
am e0f9e735: am 89d4e2dd: Fix the buid!
...
Merge commit 'e0f9e735e47b3c9e0d7a7486040aca8bb7ecb4c4' into kraken
* commit 'e0f9e735e47b3c9e0d7a7486040aca8bb7ecb4c4':
Fix the buid!
2010-03-29 15:10:43 -07:00
Romain Guy
2aba9b1e21
am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
...
Merge commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken
* commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 15:05:11 -07:00
Romain Guy
e0f9e735e4
am 89d4e2dd: Fix the buid!
...
Merge commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1' into froyo-plus-aosp
* commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1':
Fix the buid!
2010-03-29 15:05:05 -07:00
Romain Guy
89d4e2dd78
Fix the buid!
...
Change-Id: Ia6e57da393f04209b180e131df74c24e62052d8c
2010-03-29 14:58:11 -07:00
Romain Guy
21ad6043cd
am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
...
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp
* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 14:49:09 -07:00
Romain Guy
6b1e696982
Rename tab widget attributes, remove scroll barrier constant.
...
Bug #2553515 #2553595
Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
2010-03-29 14:40:34 -07:00
Doug Zongker
18867a93e8
am e1599d86: am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*
2010-03-29 14:13:53 -07:00
Romain Guy
c6fb53e650
am 6757aed3: am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
2010-03-29 14:13:49 -07:00
Dirk Dougherty
80fc48c71c
am 708a0110: am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
2010-03-29 14:13:44 -07:00
Andreas Huber
9d9853d241
am f5ca73be: am 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us
2010-03-29 14:13:40 -07:00
Doug Zongker
e1599d86ea
am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*
...
Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken
* commit '0d531f5b5927556fd94e44eedacb678f6341479b':
relocate android.util.base64.* -> android.util.*
2010-03-29 14:05:01 -07:00
Romain Guy
6757aed35d
am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
...
Merge commit 'e16741b22a55289bd22787b91842b410213556f6' into kraken
* commit 'e16741b22a55289bd22787b91842b410213556f6':
Tame the monkey.
2010-03-29 14:04:58 -07:00
Dirk Dougherty
708a01106c
am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
...
Merge commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken
* commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
doc change: Indicate that only the first 8 characters of the key alias are used.
2010-03-29 14:04:55 -07:00
Doug Zongker
0d531f5b59
am ab69e29c: relocate android.util.base64.* -> android.util.*
...
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp
* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
relocate android.util.base64.* -> android.util.*
2010-03-29 14:00:58 -07:00
Doug Zongker
ab69e29c19
relocate android.util.base64.* -> android.util.*
...
b/2553469 - API REVIEW: android.util.base64
Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
2010-03-29 13:46:47 -07:00
Jean-Baptiste Queru
3330ae6324
am b5d9614f: am 9d0f6dfd: Fix build
2010-03-29 13:09:15 -07:00
Romain Guy
e16741b22a
am 272b504e: Merge "Tame the monkey. Bug #2547546 " into froyo
...
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp
* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
Tame the monkey.
2010-03-29 13:06:20 -07:00
Dirk Dougherty
9d59c70a55
am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
...
Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp
* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
doc change: Indicate that only the first 8 characters of the key alias are used.
2010-03-29 13:06:17 -07:00
Andreas Huber
f5ca73bef0
am 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into
...
Merge commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad' into kraken
* commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
2010-03-29 13:06:11 -07:00
Andreas Huber
8ccfd36d3d
am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
...
Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp
* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
2010-03-29 13:01:27 -07:00
Jean-Baptiste Queru
b5d9614f48
am 9d0f6dfd: Fix build
...
Merge commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9' into kraken
* commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9':
Fix build
2010-03-29 13:01:26 -07:00
Romain Guy
272b504ee6
Merge "Tame the monkey. Bug #2547546 " into froyo
2010-03-29 13:00:42 -07:00
Dirk Dougherty
12cd8a3c27
Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
2010-03-29 13:00:37 -07:00
Romain Guy
7eec2bcf6f
Tame the monkey.
...
Bug #2547546
Change-Id: I2a41f53dbd71a166ddce70f3fbec24cfedaa514a
2010-03-29 13:00:07 -07:00
Andreas Huber
1e64e52c8f
Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
2010-03-29 12:58:03 -07:00
Jean-Baptiste Queru
9d0f6dfdc1
Fix build
...
Change-Id: I8c68731786ab648dc916b09333b67acb26f81594
2010-03-29 12:55:09 -07:00
Romain Guy
3811e64aa4
am bbb90328: am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
2010-03-29 12:45:44 -07:00
Dirk Dougherty
670b449763
doc change: Indicate that only the first 8 characters of the key alias are used.
...
bug: 2553183
Change-Id: I77cf7ac22b370c14f046a5a6b58b842f59e61f70
2010-03-29 12:43:27 -07:00
Romain Guy
bbb903280b
am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
...
Merge commit '7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken
* commit '7e31b282ddd1f4296ba702f7604044216a95f65e':
Rename private fields to break bad code examples
2010-03-29 12:37:48 -07:00
Romain Guy
7e31b282dd
am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
...
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp
* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
Rename private fields to break bad code examples
2010-03-29 12:34:23 -07:00
Jack Palevich
a8d54ab21b
am 3b317648: am cdb9839a: am 5d961085: Add a test of EGL pausing and resuming.
2010-03-29 12:34:07 -07:00
Romain Guy
0e1229260d
Merge "Rename private fields to break bad code examples" into froyo
2010-03-29 12:28:20 -07:00
Romain Guy
65fe2c08fa
Rename private fields to break bad code examples
...
Change-Id: I4a3e8df5de159c703db244212f78824e4105ba90
2010-03-29 12:27:30 -07:00
Jack Palevich
3b31764842
am cdb9839a: am 5d961085: Add a test of EGL pausing and resuming.
...
Merge commit 'cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken
* commit 'cdb9839a569819f233c6d0d9658ffa1fab938794':
Add a test of EGL pausing and resuming.
2010-03-29 12:24:48 -07:00
Jack Palevich
cdb9839a56
am 5d961085: Add a test of EGL pausing and resuming.
...
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp
* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
Add a test of EGL pausing and resuming.
2010-03-29 12:22:08 -07:00
Irfan Sheriff
5e1e5b31a0
am 3ef702cd: am 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
2010-03-29 12:18:34 -07:00
Jack Palevich
5d961085c3
Add a test of EGL pausing and resuming.
2010-03-29 12:16:55 -07:00
Irfan Sheriff
3ef702cd82
am 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
...
Merge commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa' into kraken
* commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa':
cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
2010-03-29 12:12:48 -07:00
Jack Palevich
e06763d041
Merge "Add a test of EGL pausing and resuming."
2010-03-29 12:11:28 -07:00
Jack Palevich
daf5537350
Add a test of EGL pausing and resuming.
2010-03-29 12:09:57 -07:00
Irfan Sheriff
92380919cc
am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
...
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp
* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
2010-03-29 12:07:37 -07:00
Irfan Sheriff
b99fe5e622
cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
...
Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.
A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.
- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.
Bug: 2546756
Change-Id: I15a188e031bc79856c55aabdd271287b0df0377d
2010-03-29 12:02:44 -07:00
Andreas Huber
62141b430f
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
...
Change-Id: I50e8976ce8d0ecc47ee0eb497296930877ce306a
related-to-bug: 2549465
2010-03-29 12:01:25 -07:00
Romain Guy
16ae14ef20
am e5beca8e: am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257 " into froyo
2010-03-29 11:40:17 -07:00
Romain Guy
e5beca8e65
am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257 " into froyo
...
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken
* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
Make EditTextPreference scrollable.
2010-03-29 11:32:53 -07:00
Romain Guy
1889f40aa1
am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257 " into froyo
...
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp
* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
Make EditTextPreference scrollable.
2010-03-29 11:28:07 -07:00
Romain Guy
ab924c909a
Merge "Make EditTextPreference scrollable. Bug #2549257 " into froyo
2010-03-29 11:24:31 -07:00
Romain Guy
b5d73d0fb0
Make EditTextPreference scrollable.
...
Bug #2549257
Change-Id: If2f69f957681e15977a7603a1f6533e9d1fea9f7
2010-03-29 11:23:18 -07:00
