James Dong
65a38b6af4
am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 10:26:40 -07:00
Xavier Ducrohet
2bbb5c35c1
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 10:22:00 -07:00
Xavier Ducrohet
a81e01a111
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 10:21:57 -07:00
Xavier Ducrohet
8d54f983ba
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit '9d9a7466cd051748ba656acd39265099294c4153':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-23 10:21:49 -07:00
James Dong
9951acae07
am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 09:59:59 -07:00
Xavier Ducrohet
7e7703528c
am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 09:52:55 -07:00
Xavier Ducrohet
03f2861cae
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 09:52:52 -07:00
Xavier Ducrohet
fc445ebe8b
am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-23 09:52:41 -07:00
Kazuhiro Ondo
58f6c371d7
am f96a6150: Data reconnection issue after airplane mode
...
* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
Data reconnection issue after airplane mode
2011-05-21 13:02:17 -07:00
Kazuhiro Ondo
a5c1bcded9
am 4c88be65: GSM DCT: Update poll stats to support multi-links
...
* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
GSM DCT: Update poll stats to support multi-links
2011-05-21 12:50:18 -07:00
Wink Saville
137a7c0dee
am 15cd6ec2: Tear down connection with unwanted linkproperty change
...
* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
Tear down connection with unwanted linkproperty change
2011-05-21 11:13:07 -07:00
Wink Saville
35a8281b9e
am 16e8d22b: Fix build.
...
* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
Fix build.
2011-05-20 23:37:28 -07:00
Wink Saville
219bf8ff11
am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
...
* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall
2011-05-20 17:26:58 -07:00
Wink Saville
d4ff38f159
Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
2011-05-20 17:23:45 -07:00
John Wang
0f5bdaaa4d
am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
...
* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
Add UI to handle SIM swap.
2011-05-20 17:22:50 -07:00
John Wang
647975b59c
Merge "Add UI to handle SIM swap." into honeycomb-LTE
2011-05-20 17:18:56 -07:00
Jim Miller
967672fd82
am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-20 16:56:51 -07:00
Jim Miller
89bbe8d827
am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-20 16:51:49 -07:00
Wink Saville
7fd53c7707
am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE
...
* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
Fix broken data retry
2011-05-20 16:51:29 -07:00
Jim Miller
643ad1de51
Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
2011-05-20 16:49:08 -07:00
Wink Saville
080fe5c2c1
Merge "Fix broken data retry" into honeycomb-LTE
2011-05-20 16:47:54 -07:00
Adam Powell
d2cb9102de
am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit 'f483ed90401d63b7317f823fcac10315146d3072':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-20 16:14:42 -07:00
Wink Saville
34c7723898
am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
...
* commit 'f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
Change getLteOnCdmaModeStatic to dynamically determine its result.
2011-05-20 16:14:33 -07:00
Dianne Hackborn
5159fb14ad
am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
...
* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
2011-05-20 16:13:54 -07:00
Adam Powell
87360924a4
am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-20 16:02:21 -07:00
Adam Powell
a7a8ea1f6f
Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
2011-05-20 15:59:19 -07:00
Robert Greenwalt
70b1bea6e1
resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
...
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
2011-05-20 15:45:55 -07:00
Wink Saville
4ee7a7cd52
Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
2011-05-20 15:27:03 -07:00
Jaikumar Ganesh
d39b7cf863
am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
...
* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
2011-05-20 14:52:48 -07:00
Jaikumar Ganesh
96bb6336f5
am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
...
* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
BT: Wrong publishing result of bonding error code.
2011-05-20 14:52:27 -07:00
Dianne Hackborn
7e4c1982d3
am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
...
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
2011-05-20 14:32:35 -07:00
Dianne Hackborn
cbc706222f
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
2011-05-20 14:28:43 -07:00
Robert Greenwalt
26e447eff3
Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE
2011-05-20 14:25:29 -07:00
Jaikumar Ganesh
bbe85a84bc
am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
...
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
2011-05-20 14:21:29 -07:00
Jaikumar Ganesh
629c19dfbc
am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
...
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
BT: Wrong publishing result of bonding error code.
2011-05-20 14:21:23 -07:00
Xavier Ducrohet
8949eabac7
Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
2011-05-20 13:56:47 -07:00
Xavier Ducrohet
e2ac5a6dfa
Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
2011-05-20 13:56:42 -07:00
Jaikumar Ganesh
701d3366e0
Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
0b0b8a76d5
Merge "BT: Wrong publishing result of bonding error code."
2011-05-20 13:35:20 -07:00
Jim Miller
f69a64dbc2
am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
...
* commit '0a734b1894511e833936362820c9e8fec3ca7df3':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
2011-05-20 13:27:25 -07:00
Jim Miller
a89de3c767
am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
...
* commit 'ef2b26695e7fa00419787bb105d448a457e9ed83':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
2011-05-20 13:27:00 -07:00
Jim Miller
2d99f8540a
am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
...
* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
2011-05-20 13:16:47 -07:00
Jim Miller
894077b7bf
am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
...
* commit '5e731140f38e06c42885fa300efc30da00711c76':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
2011-05-20 13:16:43 -07:00
Jim Miller
43e0fc2793
Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
2011-05-20 13:13:19 -07:00
Jim Miller
d01bbac731
Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
2011-05-20 13:12:57 -07:00
Adam Powell
dde0e61601
am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
...
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
New opaque cab assets; search dialog tweaks.
2011-05-20 13:09:13 -07:00
Adam Powell
0233c6ef98
am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
...
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
New opaque cab assets; search dialog tweaks.
2011-05-20 13:04:11 -07:00
Adam Powell
d415a61653
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
2011-05-20 12:59:43 -07:00
Gloria Wang
4b33903f4a
am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
...
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
2011-05-20 11:02:31 -07:00
Gloria Wang
8c9b1529d7
am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
...
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
2011-05-20 10:57:51 -07:00