Craig Mautner
c3dfaf8d58
am a13b4da6: Merge "Fix initial brightness state after startup." into jb-dev
...
* commit 'a13b4da68d8df0977c8dec5001de7c9ecea71d9e':
Fix initial brightness state after startup.
2012-05-31 13:09:48 -07:00
Amith Yamasani
4a3a9685d1
Merge "Protect volumepanel slider creation from race condition." into jb-dev
2012-05-31 13:08:07 -07:00
Craig Mautner
a13b4da68d
Merge "Fix initial brightness state after startup." into jb-dev
2012-05-31 13:07:03 -07:00
Eric Fischer
061a0904a3
Import translations. DO NOT MERGE
...
Change-Id: I25d7b5a5a2140a371bd3a3e03ae157c8e1950f18
2012-05-31 12:57:56 -07:00
Eric Fischer
70a9975ab8
Import translations. DO NOT MERGE
...
Change-Id: Id25d07811a971bc2e52eaa9e755477114642af93
2012-05-31 12:52:04 -07:00
Irfan Sheriff
39150720c0
am 39b79e79: am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev
...
* commit '39b79e79d3ad9e98a9c76c1b104599be494213f6':
Fix walled garden detection on nakasi
2012-05-31 11:35:31 -07:00
Irfan Sheriff
39b79e79d3
am ce9b5c76: Merge "Fix walled garden detection on nakasi" into jb-dev
...
* commit 'ce9b5c7611954fba91f4983bd41c0507b9931046':
Fix walled garden detection on nakasi
2012-05-31 11:30:46 -07:00
Irfan Sheriff
ce9b5c7611
Merge "Fix walled garden detection on nakasi" into jb-dev
2012-05-31 11:28:36 -07:00
Irfan Sheriff
ae094b2715
Fix walled garden detection on nakasi
...
Bug: 6576101
Change-Id: Iad2ea67e54662cd30a0e7425dab2a6174d13d152
2012-05-31 11:11:23 -07:00
Makoto Onuki
5d6c1e3dbf
am 46d12127: am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
...
* commit '46d1212704b962df06e0d150a3d81c2c95acd5f5':
Fix bug 6563184: API compatibility issue with quick contact
2012-05-31 11:05:09 -07:00
Makoto Onuki
46d1212704
am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
...
* commit 'bde32efa209acb47324add8981577af1fa410574':
Fix bug 6563184: API compatibility issue with quick contact
2012-05-31 11:01:24 -07:00
Makoto Onuki
bde32efa20
Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev
2012-05-31 10:58:58 -07:00
Philip Milne
0597161ee4
Merge "Fix for bug 6050753."
2012-05-31 10:30:09 -07:00
Craig Mautner
af01fe0215
Fix initial brightness state after startup.
...
Setting of mInitialAnimation member was assuming that currentValue
member would only be 0 at boot. It also gets set to 0 when the
sensor goes dark. This fix removes mInitialValue reliance on
currentValue.
Fixes bug 6444319.
Change-Id: I27069f1b44f1f727533d34bbecad2e5aeaa7aab8
2012-05-31 10:03:32 -07:00
Jean-Michel Trivi
2d8dab5a54
Handle wakelocks for device connection intents from AudioService
...
Now that AudioService handles the device connection intents itself,
those need to be sent under wakelock.
The wake lock is acquired when AudioService is notified of the
device connection, and released when the corresponding message
has been handled.
This change only covers the device connection messages, and doesn't
affect the handling of the other AudioService messages.
Bug 6485897
Change-Id: I2d35f5404f097b5adde8af21fd81347bdd5576a6
2012-05-31 08:58:01 -07:00
John Spurlock
b84814b279
am 60dbc3c0: am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev
...
* commit '60dbc3c05c644ae057c4946f1229387e60be8cb3':
Dock: Renable desk-dock apps
2012-05-31 08:53:10 -07:00
Uriel Rodriguez
0474853086
am 6e43ee67: (-s ours) am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
...
* commit '6e43ee6796795840819843e2693f6f3622638208':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
2012-05-31 08:53:07 -07:00
John Spurlock
60dbc3c05c
am e857632a: Merge "Dock: Renable desk-dock apps" into jb-dev
...
* commit 'e857632abd994bd1e4a649afb4231f3a97763828':
Dock: Renable desk-dock apps
2012-05-31 08:49:24 -07:00
Uriel Rodriguez
6e43ee6796
am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
...
* commit 'fa716c7b9bfe0b15725dff63a63b188fe7bc6aca':
BUG 5457035 : Anti-spoofing : DO NOT MERGE
2012-05-31 08:49:21 -07:00
John Spurlock
e857632abd
Merge "Dock: Renable desk-dock apps" into jb-dev
2012-05-31 08:44:47 -07:00
Uriel Rodriguez
fa716c7b9b
Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
2012-05-31 08:44:15 -07:00
John Spurlock
b6d8112321
am 564268f7: am a91047ff: Merge "NavBar: Don\'t resize in portrait docks when HDMI connected." into jb-dev
...
* commit '564268f7110779951e2a1f74fe25527e4369733d':
NavBar: Don't resize in portrait docks when HDMI connected.
2012-05-31 08:33:10 -07:00
Eric Laurent
846890957d
am c383b407: am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev
...
* commit 'c383b407ad24474b87de68f93ea95de495f6d2c1':
Send device connection intents from AudioService
2012-05-31 08:29:29 -07:00
John Spurlock
564268f711
am a91047ff: Merge "NavBar: Don\'t resize in portrait docks when HDMI connected." into jb-dev
...
* commit 'a91047ff23e054869f921acb2b90eafc7a65ff26':
NavBar: Don't resize in portrait docks when HDMI connected.
2012-05-31 08:29:17 -07:00
John Spurlock
a91047ff23
Merge "NavBar: Don't resize in portrait docks when HDMI connected." into jb-dev
2012-05-31 08:26:51 -07:00
Eric Laurent
c383b407ad
am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev
...
* commit 'cee7203f9ac3e54f39b5f528e014f2d3583f60dc':
Send device connection intents from AudioService
2012-05-31 08:25:33 -07:00
Eric Laurent
cee7203f9a
Merge "Send device connection intents from AudioService" into jb-dev
2012-05-31 08:22:50 -07:00
Daniel Sandler
b30cd0a801
NavBar: Don't resize in portrait docks when HDMI connected.
...
The computation moving the navbar up is too drastic when a device locked
in a portrait dock is connected to a landscape external display (e.g. a TV).
Instead, only do this if the aspect ratios of the device and external display
are the same.
Bug: 6513219
Change-Id: I7cfb1096b7d1a774032d22c4b0d7eb3177766c58
2012-05-31 10:48:53 -04:00
Daniel Sandler
6fc959f1af
am 64846efd: am 43cee47d: Merge "Simpler background art for notification panels." into jb-dev
...
* commit '64846efd6dfeb70303caa1d495fdad08a13eadce':
Simpler background art for notification panels.
2012-05-31 06:09:45 -07:00
Daniel Sandler
64846efd6d
am 43cee47d: Merge "Simpler background art for notification panels." into jb-dev
...
* commit '43cee47d4f813e43a59f907bfea030f157853fd2':
Simpler background art for notification panels.
2012-05-31 06:05:53 -07:00
Daniel Sandler
43cee47d4f
Merge "Simpler background art for notification panels." into jb-dev
2012-05-31 06:02:58 -07:00
James Dong
f517b04889
am 9ff7d5db: am 7b996d19: Fix a test case failure when there is no back-facing camera on a device
...
* commit '9ff7d5db8805255429ebf8a308e352f98c1981d0':
Fix a test case failure when there is no back-facing camera on a device
2012-05-30 22:51:31 -07:00
James Dong
9ff7d5db88
am 7b996d19: Fix a test case failure when there is no back-facing camera on a device
...
* commit '7b996d19afcc7030400b515a665d28523a44bb18':
Fix a test case failure when there is no back-facing camera on a device
2012-05-30 22:47:24 -07:00
James Dong
7b996d19af
Fix a test case failure when there is no back-facing camera on a device
...
Change-Id: I427b2e03b266ff2d92c6fe64f732a256d285020e
related-to-bug: 6538628
2012-05-30 20:36:12 -07:00
Mathias Agopian
414a57d51e
am 1a7d90c4: am 7f651969: Merge "fix a potential buffer overflow in sensorservice" into jb-dev
...
* commit '1a7d90c42ad682c8f5c6afc8c4975396380918d5':
fix a potential buffer overflow in sensorservice
2012-05-30 19:21:34 -07:00
Eino-Ville Talvala
80ee5aaeea
am ac8ed11d: am 28795d88: Merge "Fix race condition with preview callback." into jb-dev
...
* commit 'ac8ed11db3ccfa4f017bbb20d49c463595e6d90a':
Fix race condition with preview callback.
2012-05-30 19:17:28 -07:00
Mathias Agopian
1a7d90c42a
am 7f651969: Merge "fix a potential buffer overflow in sensorservice" into jb-dev
...
* commit '7f6519691fdd8062a090de74cfc5d2a906f9e5f6':
fix a potential buffer overflow in sensorservice
2012-05-30 19:16:47 -07:00
Svetoslav Ganov
2d9f96bf45
am 191e7c5a: am 758534ed: Merge "Ask to enable touch exploration only the first time it enables the feature." into jb-dev
...
* commit '191e7c5a4959e4c16154ade5d1ceb277ef31021e':
Ask to enable touch exploration only the first time it enables the feature.
2012-05-30 19:13:29 -07:00
Eino-Ville Talvala
ac8ed11db3
am 28795d88: Merge "Fix race condition with preview callback." into jb-dev
...
* commit '28795d883a34f5393ff00dca0a54aca79b2607d5':
Fix race condition with preview callback.
2012-05-30 19:12:52 -07:00
Mathias Agopian
7f6519691f
Merge "fix a potential buffer overflow in sensorservice" into jb-dev
2012-05-30 19:11:33 -07:00
Svetoslav Ganov
191e7c5a49
am 758534ed: Merge "Ask to enable touch exploration only the first time it enables the feature." into jb-dev
...
* commit '758534ed50d1d2c643999bd7eb3f909b0834e393':
Ask to enable touch exploration only the first time it enables the feature.
2012-05-30 19:08:52 -07:00
Eino-Ville Talvala
28795d883a
Merge "Fix race condition with preview callback." into jb-dev
2012-05-30 19:07:55 -07:00
Svetoslav Ganov
758534ed50
Merge "Ask to enable touch exploration only the first time it enables the feature." into jb-dev
2012-05-30 19:06:23 -07:00
Svetoslav Ganov
9a4c5cd191
Ask to enable touch exploration only the first time it enables the feature.
...
1. Now we are asking the user to grant permission to the service to enable
touch exploration only the first time this service is enabled. If the
service was uninstalled and then later installed we ask the user again.
This avoids the scenario in which rebooting the device or upgrading an
accessibility service leaves the device in a state in which the user
cannot interact with.
bug:6582088
Change-Id: I51d24e4892b3b48c9fb11dfb09ec1118502ba526
2012-05-30 18:41:08 -07:00
Amith Yamasani
d6b9734343
am ce7ce8b6: am 4b55eac4: Merge "Remove some unnecessary man page entries" into jb-dev
...
* commit 'ce7ce8b67e1db5ae2d4e0565603530e1a79cda1a':
Remove some unnecessary man page entries
2012-05-30 18:31:06 -07:00
Amith Yamasani
a654986978
Protect volumepanel slider creation from race condition.
...
It is possible for 2 different threads to poke the mStreamControls at the same time,
causing the monkey bug mentioned in the bug report below.
Bug: 6411852
Couldn't think of any other reason Stream type 3 (MUSIC) wouldn't exist in the list.
It's possible that a programmatic call came in at the same time as the volume key press.
Synchronizing blocks where the mStreamControls are populated and accessed.
Change-Id: Ifedec6b0f8bad9634cb9e079fda785c433bdb7a7
2012-05-30 18:28:08 -07:00
Amith Yamasani
ce7ce8b67e
am 4b55eac4: Merge "Remove some unnecessary man page entries" into jb-dev
...
* commit '4b55eac42dbb0bc5fb21e10f5bfde26d5f2828e3':
Remove some unnecessary man page entries
2012-05-30 18:27:34 -07:00
Amith Yamasani
4b55eac42d
Merge "Remove some unnecessary man page entries" into jb-dev
2012-05-30 18:23:36 -07:00
Dianne Hackborn
e075d5099b
am 11855f31: am 388d4801: Merge "Working on issue #6561352 : java.lang.RuntimeException: Unable to start..." into jb-dev
...
* commit '11855f31a3f7074d9fbccd1ee460b99fc47162c6':
Working on issue #6561352 : java.lang.RuntimeException: Unable to start...
2012-05-30 18:17:41 -07:00
Dianne Hackborn
11855f31a3
am 388d4801: Merge "Working on issue #6561352 : java.lang.RuntimeException: Unable to start..." into jb-dev
...
* commit '388d4801d5f314c804c5ab2dff76f764ed28a991':
Working on issue #6561352 : java.lang.RuntimeException: Unable to start...
2012-05-30 18:14:19 -07:00