48138 Commits

Author SHA1 Message Date
Conley Owens
c30d767628 am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information >
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 17:07:14 -07:00
Conley Owens
faedfc1e9b Ignore slide ui change because it is obselete in newly-refactored code 2011-04-29 17:04:25 -07:00
Conley Owens
238ef85eb6 am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit 'af99655e51ac549b7ef664141d676299ef48f3c0':
  Adding missing breaks in BnSurfaceComposer::onTransact
2011-04-29 16:58:26 -07:00
Conley Owens
0921eae141 Ignore fix since it is obsolete in newly refactored code 2011-04-29 16:55:43 -07:00
Conley Owens
92618f5fd9 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed
2011-04-29 16:44:20 -07:00
Conley Owens
5eb49e0f1e am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit 'e321d06430304fa93282c765aa6070c908121a16':
  Adding a sanity test in the while loop in readHistory()
2011-04-29 16:44:14 -07:00
Conley Owens
ba40174bc0 am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit '7bcb2f39154e7d4271486674c5a6db5756de6c29':
  Improved conversion accuracy of exif geotag data
2011-04-29 16:44:08 -07:00
Conley Owens
33e86de0af Ignore broken image fix since identical change exists in internal tree 2011-04-29 16:40:38 -07:00
Wink Saville
dd177518b5 am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE
* commit '6e748780ef01174235975508090f2e0af6c16d4d':
  CDMALTE: Evaluate data network type in pollStateDone()
2011-04-29 16:17:58 -07:00
Wink Saville
6e748780ef Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 2011-04-29 16:12:59 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
2011-04-29 14:57:53 -07:00
Conley Owens
7dcdfd7988 am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
  Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-29 14:57:18 -07:00
Conley Owens
889bb20f1b am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."
* commit 'eef8f148881f39feb0b1aded121bbfc63e8d30c2':
  Removing unnecessary computation.
2011-04-29 14:57:10 -07:00
Conley Owens
bb74af7b13 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-04-29 14:56:59 -07:00
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
2011-04-29 14:56:15 -07:00
Scott Main
27ad0df013 am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
* commit '205d6fb38d3c39a39ee9721b0d8e3649afacad18':
  docs: tweak table headers for config qualifiers
2011-04-29 14:56:06 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references."
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-29 14:55:55 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Conley Owens
ded7c652d7 am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
  Remove duplicate '=' in exception message
2011-04-29 14:55:35 -07:00
James Dong
a1f6a09a86 am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:53:30 -07:00
Scott Main
1462813a28 Merge "docs: more documentation for ProgressBar" into honeycomb 2011-04-29 14:52:20 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Scott Main
205d6fb38d am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
  docs: tweak table headers for config qualifiers
2011-04-29 14:46:28 -07:00
James Dong
f181e416ee am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:42:58 -07:00
Scott Main
be2da3c9b6 am c7eb47fa: docs: tweak table headers for config qualifiers
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
  docs: tweak table headers for config qualifiers
2011-04-29 14:42:55 -07:00
Scott Main
c7eb47fad4 docs: tweak table headers for config qualifiers
Change-Id: Idc8d48f1db9b6b87372a49095b034edff9baecfa
2011-04-29 14:12:24 -07:00
Kazuhiro Ondo
f0055d5e3c CDMALTE: Evaluate data network type in pollStateDone()
During LTE to HRPD handover, CDMA data network type (1X, DO, RevA)
was not detected immediately as the checking was not done without
waiting for the LTE state. The patch will wait for pollStateDone
to determine new data network state.

Change-Id: I2d63d43df1f3124ba27f77897abef30f06be650d
2011-04-29 11:47:07 -07:00
Conley Owens
1a846ab089 am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal
* commit 'b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 10:23:58 -07:00
Conley Owens
24825d59f1 am 1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close."
* commit '1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
  modify the device to enable to get the state as slide-open/slide-close.
2011-04-29 10:23:53 -07:00
Conley Owens
af99655e51 am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
* commit '69ef0d55d7d7cb9b9bcccffff50ea10ac3833aaa':
  Adding missing breaks in BnSurfaceComposer::onTransact
2011-04-29 10:23:47 -07:00
Conley Owens
1ba8543723 am 7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed"
* commit '7ae9f08a179fa3b312b80826cfc3c6dc97b792ec':
  Fixed to call computeVisibleRegions() when transparent value changed
2011-04-29 10:23:42 -07:00
Conley Owens
52749c0b11 am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"
* commit '03daee6380772b0ab167a7b28e37d7a21ec89c86':
  frameworks/base: acquire lock on am only when needed
2011-04-29 10:23:35 -07:00
Conley Owens
e321d06430 am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
  Adding a sanity test in the while loop in readHistory()
2011-04-29 10:23:28 -07:00
Conley Owens
7bcb2f3915 am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"
* commit 'c5505f6a150db8232cc275bedd400f7f5a593530':
  Improved conversion accuracy of exif geotag data
2011-04-29 10:20:34 -07:00
Conley Owens
a50913aaf7 am e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
* commit 'e1b3f15cadc630469cfadea63275ba8d9a1c9052':
  Fixes broken image link in "Tools -> Traceview" documentation page.
2011-04-29 10:20:25 -07:00
Robert Greenwalt
67c92fbdfe am 5f2ff42b: Add data to bugreports.
* commit '5f2ff42b282e093b61b9e7b07c79a74ea8ce3272':
  Add data to bugreports.
2011-04-29 10:14:26 -07:00
Conley Owens
b1578d85ce Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown" 2011-04-29 09:59:48 -07:00
Conley Owens
1ecd0a9b28 Merge "modify the device to enable to get the state as slide-open/slide-close." 2011-04-29 09:59:42 -07:00
Conley Owens
69ef0d55d7 Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 2011-04-29 09:59:36 -07:00
Conley Owens
7ae9f08a17 Merge "Fixed to call computeVisibleRegions() when transparent value changed" 2011-04-29 09:59:30 -07:00
Conley Owens
03daee6380 Merge "frameworks/base: acquire lock on am only when needed" 2011-04-29 09:59:22 -07:00
Conley Owens
2f463ef18b Merge "Adding a sanity test in the while loop in readHistory()" 2011-04-29 09:56:58 -07:00
Conley Owens
c5505f6a15 Merge "Improved conversion accuracy of exif geotag data" 2011-04-29 09:48:10 -07:00
Conley Owens
e1b3f15cad Merge "Fixes broken image link in "Tools -> Traceview" documentation page." 2011-04-29 09:48:04 -07:00
Robert Greenwalt
5f2ff42b28 Add data to bugreports.
Include IPv6 routes and iptables data.

Change-Id: Ie9bca8a935f93933082eef0c45f83a17be76b7ed
2011-04-29 09:43:49 -07:00
Conley Owens
54668b8a35 am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()
2011-04-28 23:52:45 -07:00
Conley Owens
f26ec38c34 am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
  Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-28 23:52:41 -07:00