Wink Saville
d1afa8fec0
am eb731123: am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
...
* commit 'eb7311231203b7943027fd9992a5a59f67799615':
Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-16 10:44:28 -08:00
Nick Pelly
32a97d7c2b
am 18f52d53: am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
...
* commit '18f52d533d735c4221d0da7c73583cfee377587d':
Make sure service handles are live before passing to other objects.
2011-01-16 10:44:06 -08:00
Jean-Baptiste Queru
5076ba0aa1
am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
...
* commit '89a11e5d5c3210359679e6f211444e0d7240ae0a':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
2011-01-16 10:44:01 -08:00
Jaikumar Ganesh
ec647e2efa
am e76ca5e0: (-s ours) am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
...
* commit 'e76ca5e0f1cd7b5417ed5bc05ef4cbe968e8197e':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-16 10:43:56 -08:00
Dianne Hackborn
2313e6a932
am 89f0e6fe: am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
...
* commit '89f0e6fe38a6388b044fca627287ceeeaa8bf88d':
Don't drop the drawable cache completely on configuration change
2011-01-16 10:43:49 -08:00
Dianne Hackborn
c87851cfec
am ff59234a: am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
...
* commit 'ff59234a4116fe871cc94c678240a54243d7fa37':
Make the Phone options dialog use current language
2011-01-16 10:43:44 -08:00
Dianne Hackborn
84944a7419
am ba3aa224: am e1d12668: am 0950a3ef: Merge "Added check to make orientation calculations more robust"
...
* commit 'ba3aa22429a3f8b09c501b9adec4accf56c2337f':
Added check to make orientation calculations more robust
2011-01-16 10:43:38 -08:00
Dianne Hackborn
a37bc9ae23
am b69c4e36: am 544ff558: am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
...
* commit 'b69c4e36bec6bfd66e9d67ee3a5befab98ff9e64':
Added check to make orientation calculations more robust
2011-01-16 10:43:32 -08:00
Dianne Hackborn
e98a7d665f
am 21b0fb95: am ff3a2c18: am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
...
* commit '21b0fb951b0aaa6a07a4aaed4a4733ca659d93db':
Make the Phone options dialog use current language
2011-01-16 10:43:25 -08:00
Romain Guy
66af556743
am 32221306: am 2e7fbd97: Merge "Preapre region tracking in layers" into honeycomb
...
* commit '32221306848988e6857ae0f76a3f17c866d62561':
Preapre region tracking in layers
2011-01-16 10:42:54 -08:00
Mathias Agopian
cd6357573d
am 0f508731: am fd7a411a: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
...
* commit '0f508731221c9997811fda189254a4bb1e3821bd':
partially fix [3306150] HTML5 video with H/W acceleration blackout
2011-01-16 10:42:46 -08:00
Mathias Agopian
12dd5a3c9d
am ceaf8ac3: am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
...
* commit 'ceaf8ac31c0ee131f5c7865feb227f60def729df':
Fix error reporting in Surface::cancelBuffer()
2011-01-16 10:42:39 -08:00
James Dong
d233168da2
am b3f44773: am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
...
* commit 'b3f44773897588cf1ab6335444e4ca5fb0160a7f':
Fixed thrashing in the cached buffer during 720p YT video streaming
2011-01-16 10:42:32 -08:00
Jeff Brown
62e578678b
am c299302e: am 7a1c32e7: Merge "Add support for detecting finger orientation." into honeycomb
...
* commit 'c299302e986646c74ce878502cc72ff33c9849c0':
Add support for detecting finger orientation.
2011-01-16 10:42:25 -08:00
Justin Ho
a34e70886e
am a6724ae1: am 0a26f3ce: Merge "New tray notification icons, new system bar icons" into honeycomb
...
* commit 'a6724ae1de4db7f57d8b0558d6d7d7c0307318af':
New tray notification icons, new system bar icons
2011-01-16 10:42:11 -08:00
Romain Guy
becbd8d5eb
am cfde8514: am 739e34a3: Merge "Don\'t crash Launcher on config change." into honeycomb
...
* commit 'cfde851492e4ea5c2382dedf4dcc697a2818784b':
Don't crash Launcher on config change.
2011-01-16 10:42:01 -08:00
Adam Powell
0b5acd507f
am 7128722b: am 1362c94b: Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb
...
* commit '7128722bce15bb0de89829676f7722ce39f1eb84':
Fix bug 3337711 - Volume panel layout adjustments
2011-01-16 10:41:53 -08:00
Jeff Brown
8e0b31b1a9
am 2440c437: am 77c3e4b9: Merge "Make getFallbackAction return false when there is none." into honeycomb
...
* commit '2440c437698eee54f6595a88c66a779fcce50e5c':
Make getFallbackAction return false when there is none.
2011-01-16 10:41:34 -08:00
Jeff Brown
ddb16aa8a6
am 9f1ae205: am 06bc9721: Merge "Disable soft keyboard when keyboard attached." into honeycomb
...
* commit '9f1ae205b40a2cc730b3e07b1a408ad2803c40fd':
Disable soft keyboard when keyboard attached.
2011-01-16 10:41:22 -08:00
Jeff Brown
48eea948dc
am 195f13b8: am 1061b966: Merge "Fix bug with mice that send multiple BTN_MOUSE values." into honeycomb
...
* commit '195f13b803e26375d58d03dd61099f586d86ea8c':
Fix bug with mice that send multiple BTN_MOUSE values.
2011-01-16 10:41:03 -08:00
Xavier Ducrohet
47b130e219
am c9770b36: am 72fcd0a4: Merge "LayoutLib: update logs to use new data bundle" into honeycomb
...
* commit 'c9770b36144827e6a68ac12d1a61816f2dcdb236':
LayoutLib: update logs to use new data bundle
2011-01-16 10:40:48 -08:00
Romain Guy
720b3ee1b1
am 2be00ccb: am 8dd5b1e5: Prevent NPE when a View is detached without having been attached. Bug #3355252
...
* commit '2be00ccbe7c8e2aedfa15b6b7c469160734dda15':
Prevent NPE when a View is detached without having been attached. Bug #3355252
2011-01-16 10:40:38 -08:00
Jeff Brown
db10a638fd
am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
...
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Wink Saville
eb73112312
am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
...
* commit 'a47aa87a19c733e28d9d2db1c4eb7f29d668db7b':
Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-15 10:13:07 -08:00
Wink Saville
a47aa87a19
Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
2011-01-15 10:11:08 -08:00
Wink Saville
ad8c32f302
Set mIsMinInfoReady and mCurrentOtasp before notifcations.
...
We were sending a notification before setting mIsMinInfoReady and
mCurrentOtasp. This causes a race and it's possible that
OtaUtils.maybeDoOtasp is called before before they are set.
In this case the activation would not occur.
Bug: 3339109
Change-Id: I3baf8992d58af63a5cc07a14cc33157fd1c5aaa3
2011-01-15 07:47:03 -08:00
Nick Pelly
18f52d533d
am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread
...
* commit 'f780350edb403739fee1a99b0ca91541f5ec0b91':
Make sure service handles are live before passing to other objects.
2011-01-14 21:30:20 -08:00
Jean-Baptiste Queru
89a11e5d5c
am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
...
* commit '9286cfe5017363d95798d85163ec4f28aeb0c675':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
2011-01-14 21:30:16 -08:00
Jaikumar Ganesh
e76ca5e0f1
am ef6abd8a: (-s ours) am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
...
* commit 'ef6abd8a3e4b05cb9d94f29f4e8ffc7bb2ecec77':
Do Not Merge: Expose insecure rfcomm Bluetooth API.
2011-01-14 21:30:06 -08:00
Dianne Hackborn
89f0e6fe38
am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"
...
* commit 'dd4a1e3825f4f379ba36fd721f78de0101bb1833':
Don't drop the drawable cache completely on configuration change
2011-01-14 21:29:59 -08:00
Dianne Hackborn
ff59234a41
am 1e6f5f04: am c3d0d860: Merge "Make the Phone options dialog use current language"
...
* commit '1e6f5f0453a2be0553de39c3b6f97da7c66b0b3b':
Make the Phone options dialog use current language
2011-01-14 21:29:48 -08:00
Dianne Hackborn
ba3aa22429
am e1d12668: am 0950a3ef: Merge "Added check to make orientation calculations more robust"
...
* commit 'e1d12668c1f443b1c71b5e78587353dffa5b1774':
Added check to make orientation calculations more robust
2011-01-14 21:29:43 -08:00
Dianne Hackborn
b69c4e36be
am 544ff558: am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread
...
* commit '544ff558a80912d968570494363cea6540c08dd3':
Added check to make orientation calculations more robust
2011-01-14 21:29:32 -08:00
Dianne Hackborn
21b0fb951b
am ff3a2c18: am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread
...
* commit 'ff3a2c18924bffa76207fb1ba8b5e79f860c4867':
Make the Phone options dialog use current language
2011-01-14 21:29:26 -08:00
Romain Guy
3222130684
am 2e7fbd97: Merge "Preapre region tracking in layers" into honeycomb
...
* commit '2e7fbd97e6f3682b20631d4f5262321dba6e2c6f':
Preapre region tracking in layers
2011-01-14 20:06:18 -08:00
Romain Guy
2e7fbd97e6
Merge "Preapre region tracking in layers" into honeycomb
2011-01-14 20:04:42 -08:00
Romain Guy
1bd1bad0b4
Preapre region tracking in layers
...
Change-Id: Ied1fa0d36c99ef4e33cb8fde7e3106a793db3a4c
2011-01-14 20:07:20 -08:00
Mathias Agopian
0f50873122
am fd7a411a: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
...
* commit 'fd7a411aef7e1c7722456de09b3f3234bbb914d4':
partially fix [3306150] HTML5 video with H/W acceleration blackout
2011-01-14 19:29:44 -08:00
Mathias Agopian
ceaf8ac31c
am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
...
* commit 'a7393dd66f0127c8acdd5f8928b0c2d0de602275':
Fix error reporting in Surface::cancelBuffer()
2011-01-14 19:29:40 -08:00
Mathias Agopian
fd7a411aef
Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb
2011-01-14 19:27:38 -08:00
Mathias Agopian
a7393dd66f
Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb
2011-01-14 19:27:32 -08:00
James Dong
b3f4477389
am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
...
* commit 'e7df0ddee486f4705b17b4d8ed57ddbeb8b71943':
Fixed thrashing in the cached buffer during 720p YT video streaming
2011-01-14 19:22:26 -08:00
Jeff Brown
c299302e98
am 7a1c32e7: Merge "Add support for detecting finger orientation." into honeycomb
...
* commit '7a1c32e719725787acda4885ad7bd8031975e8c7':
Add support for detecting finger orientation.
2011-01-14 19:20:07 -08:00
James Dong
e7df0ddee4
Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
2011-01-14 19:19:41 -08:00
Jeff Brown
7a1c32e719
Merge "Add support for detecting finger orientation." into honeycomb
2011-01-14 19:18:16 -08:00
Jeff Brown
517bb4c859
Add support for detecting finger orientation.
...
Change-Id: I901fc61f7705fcd7950190dc8782bad616032ee2
2011-01-14 19:12:48 -08:00
Justin Ho
a6724ae1de
am 0a26f3ce: Merge "New tray notification icons, new system bar icons" into honeycomb
...
* commit '0a26f3ce96c628a22892b09b69bcbb58cc700165':
New tray notification icons, new system bar icons
2011-01-14 19:03:50 -08:00
Justin Ho
0a26f3ce96
Merge "New tray notification icons, new system bar icons" into honeycomb
2011-01-14 19:01:58 -08:00
Romain Guy
cfde851492
am 739e34a3: Merge "Don\'t crash Launcher on config change." into honeycomb
...
* commit '739e34a362518020b4aed3f2dc54be2154c41406':
Don't crash Launcher on config change.
2011-01-14 18:51:33 -08:00
Romain Guy
739e34a362
Merge "Don't crash Launcher on config change." into honeycomb
2011-01-14 18:49:55 -08:00