Eino-Ville Talvala
001778393d
Merge "Add camera as an ATRACE tag"
2012-05-31 18:32:54 -07:00
Eino-Ville Talvala
9c0d9cf25f
Add camera as an ATRACE tag
...
Change-Id: I7b4fc51f8b0eb97190817f8cbc9f743b0d112922
2012-05-31 18:12:18 -07:00
Chris Craik
35ec6b7b30
am 7d4c2ec0: am 53913ed5: Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
...
* commit '7d4c2ec0f4dc1843ed5e3f6768d55cc9506052c6':
Force webview invalidates on unsuccessful functor attach
2012-05-31 18:06:13 -07:00
Alice Yang
e56a8e7c7d
am 3fea6462: am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev
...
* commit '3fea64623bc52f01af451bae9d18129c327300c4':
Fix bug where existing account not pre-checked
2012-05-31 18:06:01 -07:00
Chris Craik
7d4c2ec0f4
am 53913ed5: Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
...
* commit '53913ed55ce2b5f0d2137b2a7b67eaf7556c0c28':
Force webview invalidates on unsuccessful functor attach
2012-05-31 18:00:46 -07:00
Chris Craik
53913ed55c
Merge "Force webview invalidates on unsuccessful functor attach" into jb-dev
2012-05-31 17:57:45 -07:00
Alice Yang
3fea64623b
am be504401: Merge "Fix bug where existing account not pre-checked" into jb-dev
...
* commit 'be5044015212b82a6e530c4516004255fe245ebe':
Fix bug where existing account not pre-checked
2012-05-31 17:11:58 -07:00
Alice Yang
6cab5e823a
Fix bug where existing account not pre-checked
...
The fix was to call ListView.setItemChecked()
instead of ListView.setSelection() for setting radio button status.
Also refactored the code a bit so it's less verbose.
Bug 6588533
Change-Id: I8add072a0277183baec7c0d5634a28f2d3a28c5e
2012-05-31 15:48:51 -07:00
Chris Craik
41ee465734
Force webview invalidates on unsuccessful functor attach
...
Functor attach should always be successful, but adding a fallback just in
case. Also invalidates the WebView on initial content arriving.
bug:6511995
Change-Id: Ibca16505afec9f693ea4a7cc4966cd6d7353725c
2012-05-31 15:23:11 -07:00
Amith Yamasani
30e4e88c91
am 2afe8252: am 4a3a9685: Merge "Protect volumepanel slider creation from race condition." into jb-dev
...
* commit '2afe8252addcf080d4752e85f6d0f21c930fde7f':
Protect volumepanel slider creation from race condition.
2012-05-31 13:17:11 -07:00
Amith Yamasani
2afe8252ad
am 4a3a9685: Merge "Protect volumepanel slider creation from race condition." into jb-dev
...
* commit '4a3a9685d17cb29f70a7c56a3d33f2c8d5288e72':
Protect volumepanel slider creation from race condition.
2012-05-31 13:13:34 -07:00
Amith Yamasani
4a3a9685d1
Merge "Protect volumepanel slider creation from race condition." into jb-dev
2012-05-31 13:08:07 -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
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
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
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
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
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
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
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
Dianne Hackborn
388d4801d5
Merge "Working on issue #6561352 : java.lang.RuntimeException: Unable to start..." into jb-dev
2012-05-30 18:11:23 -07:00
Svetoslav Ganov
4305cd3276
am c6dd2dd4: am f14c078c: Merge "Don\'t mark list headers or invalid items as disabled." into jb-dev
...
* commit 'c6dd2dd4b38b96be3deee94540973c83498a496c':
Don't mark list headers or invalid items as disabled.
2012-05-30 17:53:55 -07:00
Svetoslav Ganov
c6dd2dd4b3
am f14c078c: Merge "Don\'t mark list headers or invalid items as disabled." into jb-dev
...
* commit 'f14c078ccc8fe8a2435d3c6b6e47aad81fffd663':
Don't mark list headers or invalid items as disabled.
2012-05-30 17:49:17 -07:00
Svetoslav Ganov
f14c078ccc
Merge "Don't mark list headers or invalid items as disabled." into jb-dev
2012-05-30 17:47:02 -07:00
Eino-Ville Talvala
ca367b7178
Fix race condition with preview callback.
...
Bug: 6301018
Change-Id: I19b8bc03ef3983d69e1e986c0f1a8154af5ab080
2012-05-30 17:06:54 -07:00
Dianne Hackborn
61af8a8ef7
Working on issue #6561352 : java.lang.RuntimeException: Unable to start...
...
...activity ComponentInfo{com.google.android.googlequicksearchbox
/com.google.android.googlequicksearchbox.SearchActivity}
Add check for a situation where we are saving the state of a
fragment with a -1 index, and fail early in that case with more
debug information.
Change-Id: I03a928dde521fa06664d0036dd9f90eef3247afc
2012-05-30 16:38:30 -07:00
Kenny Root
327bc6bb50
am 65519b8b: am 03e93e51: Merge "Move package-wide flags out of parseApplication" into jb-dev
...
* commit '65519b8bb94321889eb3e34c76428f6dd9e0bd84':
Move package-wide flags out of parseApplication
2012-05-30 15:50:45 -07:00
Amith Yamasani
2f3c472b69
am 2eb203aa: am 90f658e1: Merge "Preserve account list in order of creation in the database." into jb-dev
...
* commit '2eb203aa92df94d9a2160bc8626adef7429a85b8':
Preserve account list in order of creation in the database.
2012-05-30 15:50:41 -07:00
Kenny Root
65519b8bb9
am 03e93e51: Merge "Move package-wide flags out of parseApplication" into jb-dev
...
* commit '03e93e51c8cf936dc68bb807d28308628e3981cc':
Move package-wide flags out of parseApplication
2012-05-30 15:46:49 -07:00
Amith Yamasani
2eb203aa92
am 90f658e1: Merge "Preserve account list in order of creation in the database." into jb-dev
...
* commit '90f658e17d86d7f4052b178dbfdf15977c5d7841':
Preserve account list in order of creation in the database.
2012-05-30 15:46:47 -07:00
Kenny Root
03e93e51c8
Merge "Move package-wide flags out of parseApplication" into jb-dev
2012-05-30 15:43:42 -07:00
Amith Yamasani
90f658e17d
Merge "Preserve account list in order of creation in the database." into jb-dev
2012-05-30 15:43:19 -07:00
Fabrice Di Meglio
3b6a3f004f
am 875713c6: am f053e236: Merge "Fix bug #6567507 [Bidi] - Cursor is sometimes not visible on EditText" into jb-dev
...
* commit '875713c6886a5b24fff3a2ce36eb95bc9446e749':
Fix bug #6567507 [Bidi] - Cursor is sometimes not visible on EditText
2012-05-30 15:37:40 -07:00
alanv
325ea8deb8
Don't mark list headers or invalid items as disabled.
...
Bug: 6581689
Change-Id: I4088cdc7e785e60fe7e30807cdf045131584f29d
2012-05-30 15:36:18 -07:00
Fabrice Di Meglio
875713c688
am f053e236: Merge "Fix bug #6567507 [Bidi] - Cursor is sometimes not visible on EditText" into jb-dev
...
* commit 'f053e2367d4859adf9488bd1712bdbe8f647eeb8':
Fix bug #6567507 [Bidi] - Cursor is sometimes not visible on EditText
2012-05-30 15:34:07 -07:00
Fabrice Di Meglio
f053e2367d
Merge "Fix bug #6567507 [Bidi] - Cursor is sometimes not visible on EditText" into jb-dev
2012-05-30 15:31:23 -07:00
Kenny Root
7cb9be26c1
Move package-wide flags out of parseApplication
...
Being on SD card and being forward-locked are package-wide flags that
shouldn't depend on an APK having an <application> stanza.
Bug: 6563724
Change-Id: If5f2159cd8e3fa136f959b656d82b05ea6bdfae5
2012-05-30 15:30:37 -07:00
Jeff Brown
8f2a0da78f
am bbffc261: am 9154b877: Merge "Fix comparison of device source bits." into jb-dev
...
* commit 'bbffc261cc3607d03c12227cdd3f78a4f4e28e1a':
Fix comparison of device source bits.
2012-05-30 15:08:21 -07:00
Jeff Brown
bbffc261cc
am 9154b877: Merge "Fix comparison of device source bits." into jb-dev
...
* commit '9154b877807a1222abf46608cdff66428e906328':
Fix comparison of device source bits.
2012-05-30 15:02:59 -07:00
Jeff Brown
9154b87780
Merge "Fix comparison of device source bits." into jb-dev
2012-05-30 15:00:39 -07:00
Eric Laurent
b1fbaaccb6
Send device connection intents from AudioService
...
AudioService is currently notified of wired headset and A2DP
sink connection states via broadcast intents from WiredAccessoryObserver
and BluetoothA2dpService. This is a problem as there is no guaranty that
AudioService can take actions upon the change before other apps are notified.
For instance, the Play On feature requires the UI to be refreshed when a device
is inserted/removed and we must guaranty that the UI component can read
new A2DP enable state from AudioManager after it receives a device connection state
change intent.
- Added hidden methods to AudioManager so that WiredAccessoryObserver
and BluetoothA2dpService can notify AudioService of device connection directly.
- The wired accessories connection intents are now sent by AudioService.
- The A2DP state change intent is delayed by BluetoothA2DPService when
ACTION_AUDIO_BECOMING_NOISY is sent by AudioService
- ACTION_AUDIO_BECOMING_NOISY intent is not sent when disconnecting A2DP
while a wired headset is present and vice versa.
Bug 6485897.
Change-Id: Ie160b3ee5f451132065530772b868593c90afd94
2012-05-30 14:44:43 -07:00