48751 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
f55a00b1b8 am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
  Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:55:37 -07:00
Shimeng (Simon) Wang
de60ce66c1 am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
* commit '358d2cd96403383cfb91bb68598a4cb2fe2e170e':
  Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:14:04 -07:00
James Dong
d5762583bd 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
46e802e9c1 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
ea182704b6 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
162dd490cd 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
Shimeng (Simon) Wang
358d2cd964 Simplify browser pause/resume logic to avoid stuck timer.
The current browser pause/resume logic uses an integer count to track
the pause/resume behavior, which is mostly working fine in phone.  The interger
count is usually 0 when browser is paused, and its value is usually 1
when the browser is resumed and will trigger any delayed timer.

But in tablet, where tabs can be easily created/switched/deleted, this
logic will not work well and sometimes cause resources timers get stuck.
For example, in case multiple tabs are created, and you reload one of the
tabs, when it's almost finished, switch to another tab, and hit home or power
button, at this point of time, the browser will be suspended at
Controller.java::onPause, hence the integer count will be 0; but since
the other tab is also finished after the pause, the current logic at
Controller.java::onPageFinished will call pause timer again, which will make
the integer count to be -1.  Before the time the browser is resumed, it's very
possible some tabs will have some resources, such as images/flashs,
scheduled to be loaded, these will be in delayed timer in
ResourceLoadScheduler.cpp's m_requestTimer.
Now when the browser is resumed, the integer count will be 0, which will not
trigger delayed timer.  Then all the new timers will be stuck as well since
old timers are not executed yet.

The fix is to simplify the pause/resume logic by just using a boolean variable
instead of error-prone integer counting.

issue: 4177932
Change-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630
2011-05-23 10:00:39 -07:00
James Dong
ebae192386 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
5b9ec6871a 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
041fd74bea 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
9d9a7466cd 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
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release().
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
2011-05-23 09:36:31 -07:00
Kazuhiro Ondo
6056e3268a 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
8e1f6eceb3 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
Kazuhiro Ondo
f96a6150e4 Data reconnection issue after airplane mode
ApnContext and DC were not disassociated when force
"cleanUpConnection" was called. Causing the setup
request was not happening if applyNewStatus() was
the trigger.

Change-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa
2011-05-21 12:49:41 -07:00
Kazuhiro Ondo
4c88be655e GSM DCT: Update poll stats to support multi-links
Change-Id: I654e38e71f9576ed2c4da59af563be04bc87045c
2011-05-21 11:57:41 -07:00
Wink Saville
7abbf93c85 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
15cd6ec250 Tear down connection with unwanted linkproperty change
Make sure to disconnect the link when RIL reported link property change
which could cause connectivity issue. (i.e. IP address)

Change-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2
2011-05-21 10:05:26 -07:00
Wink Saville
f7bc0e28bf am 16e8d22b: Fix build.
* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
  Fix build.
2011-05-20 23:37:28 -07:00
Wink Saville
16e8d22b20 Fix build.
A merge accidentally included a line that was deleted.

Change-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5
2011-05-20 23:31:29 -07:00
Wink Saville
f8d70b14e4 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
5f353de96b 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
b7a13791a1 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
393eb0d06b Merge "Add UI to handle SIM swap." into honeycomb-LTE 2011-05-20 17:18:56 -07:00
Jim Miller
59a3319ffc 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
John Wang
10e9f668ee Add UI to handle SIM swap.
bug:4364964

Change-Id: Iadf466401a24dfbd638353d689e6ae89506afc97
2011-05-20 16:52:51 -07:00
Kazuhiro Ondo
edbe2cc386 Notify RIL that PDP reset is triggered due to data stall
Additional deactivate cause so RIL could take intelligent action
on data stall occurrence if necessary.

Change-Id: Iae4accda879efb5679085c518117617fb16631c3
2011-05-20 16:52:46 -07:00
Jim Miller
67cd389d4b 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
0ba625259e 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
2c7906eb39 Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 2011-05-20 16:49:08 -07:00
Wink Saville
2b534e770d Merge "Fix broken data retry" into honeycomb-LTE 2011-05-20 16:47:54 -07:00
Adam Powell
7dfdb91420 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
61a5ab57b8 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
Jim Miller
024e429b49 Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
2011-05-20 16:14:15 -07:00
Dianne Hackborn
070a19e035 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
f483ed9040 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
bdc26dc34a 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
Adam Powell
3f4a764cf4 Change measurement of effective screen height for PopupWindow now that
DisplayMetrics reports it without system decorations.

Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
2011-05-20 15:56:25 -07:00
Robert Greenwalt
5a6bec53e2 resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
2011-05-20 15:45:55 -07:00
Kazuhiro Ondo
5ce6268faa Fix broken data retry
Change I2b737efa6092ad1254c8dc25840ec429f5c6e882 brought side
effect that retry count is reset at every setup.

Change-Id: I6f20d2e82110b2873ff5acbb60a747fd11c09c60
2011-05-20 15:31:33 -07:00
Wink Saville
f89ea7a5ec Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 2011-05-20 15:27:03 -07:00
Jaikumar Ganesh
69ed0b628e 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
e2271a55ad 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
Xavier Ducrohet
4c1e73b69a Merge e57aa434 from honeycomb-mr1. do not merge.
LayoutLib: Fix issue where <include> with no layout params wouldn't display.

The issue is that the layout params from the root element of the included
layout should be used but this failed because loading the layout params
from the <include> tag didn't throw a RuntimeException in our modified
code (BridgeTypedArray).

Because we don't want to throw exception in general we only throw it
when reading the layout params of an include node which is pretty crappy,
but works for now.

Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
2011-05-20 14:50:45 -07:00
Dianne Hackborn
5c8caba2e5 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
1b144e625f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Robert Greenwalt
dec3dda873 Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE 2011-05-20 14:25:29 -07:00
Jaikumar Ganesh
d1735ef91a 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
d7030e551a 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
f791863f0a Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:47 -07:00