drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,632 Commits 1 Branch 0 Tags
Commit Graph

49632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Conley Owens
4c79ca8cae am c30d7676: 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 
* commit 'c30d767628861b0bbea907824682e47732c820f9':
  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-05-02 10:11:43 -07:00
Conley Owens
1bb64f534f am faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code 
* commit 'faedfc1e9be10ab29d563b7aede57cdac6e44799':
  modify the device to enable to get the state as slide-open/slide-close.
 2011-05-02 10:11:39 -07:00
Conley Owens
38ae12e320 am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 
* commit '238ef85eb6894408c5a59cdb93405001c972f450':
  Adding missing breaks in BnSurfaceComposer::onTransact
 2011-05-02 10:11:34 -07:00
Conley Owens
d89cc62849 am 0921eae1: Ignore fix since it is obsolete in newly refactored code 
* commit '0921eae141eebbe52762d4a1cde0edf98fefbda2':
  Fixed to call computeVisibleRegions() when transparent value changed
 2011-05-02 10:11:29 -07:00
Conley Owens
0a1b746686 am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" 
* commit '92618f5fd9e4a0469d60cab39765b7c820c1976b':
  frameworks/base: acquire lock on am only when needed
 2011-05-02 10:11:11 -07:00
Conley Owens
5e3357fcee Merge commit '5eb49e0f' into m 
Conflicts:
	core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
 2011-05-02 09:59:30 -07:00
Conley Owens
f0cae1a3f0 am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" 
* commit 'ba40174bc02f35aa2f6339a04de4f8993f2cd750':
  Improved conversion accuracy of exif geotag data
 2011-04-29 18:08:16 -07:00
Conley Owens
89dd78b6f7 am 33e86de0: Ignore broken image fix since identical change exists in internal tree 
* commit '33e86de0af31d16acda140d8dc45a256b2509211':
  Fixes broken image link in "Tools -> Traceview" documentation page.
 2011-04-29 18:08:06 -07:00
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
Stephen Hines
7fba67e630 Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correct size. Caused failure on fifo wrap." 2011-04-29 16:37:46 -07:00
Gloria Wang
efc69d72c9 Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" 2011-04-29 16:35:26 -07:00
Jason Sams
eccf6c6483 Fix bug 4355588 
With auto inbanding the fifo didn't reserve the correct size.
Caused failure on fifo wrap.

Change-Id: Ie78e7bef5286f68c6239f79ee2f284fd99bdacc3
 2011-04-29 16:23:40 -07:00
Wink Saville
3304f8fa8d am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE 
* commit 'dd177518b5438bf12a0ee5e1c99970cd48eb025f':
  CDMALTE: Evaluate data network type in pollStateDone()
 2011-04-29 16:20:15 -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
Gloria Wang
2cf1f52374 Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156." 2011-04-29 15:26:18 -07:00
Scott Main
bd3ddbb809 am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
  docs: more documentation for ProgressBar
 2011-04-29 15:11:50 -07:00
Conley Owens
19b7cd95ff am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 15:11:48 -07:00
Conley Owens
17f83df960 am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-29 15:11:45 -07:00
Conley Owens
280a0c17d7 am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." 
* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93':
  Removing unnecessary computation.
 2011-04-29 15:11:41 -07:00
Conley Owens
fe96a021cf am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':
 2011-04-29 15:11:38 -07:00
Conley Owens
a02a9e602b am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
  Using robust equality check.
 2011-04-29 15:11:34 -07:00
Conley Owens
1b38cc3057 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit '014757eea22fc9cceede1548c579c33c79464001':
  We don't need these local references.
 2011-04-29 15:11:30 -07:00
Conley Owens
95b533911c am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 15:11:26 -07:00
Conley Owens
3513e1ca6f am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" 
* commit 'ded7c652d754751e6fbde729d66825c69394d1cb':
  Remove duplicate '=' in exception message
 2011-04-29 15:11:22 -07:00
Nick Kralevich
144a2883cb Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-04-29 15:11:19 -07:00
Svetoslav Ganov
f0f955e2c3 Merge "Touch exploration - nits" 2011-04-29 15:10:14 -07:00
Svetoslav Ganov
887e1a17eb Touch exploration - nits 
Change-Id: Ie49558e0a81218dbad70c02f81dd7a59b3213d5c
 2011-04-29 15:09:28 -07:00
Scott Main
d2e3607f49 am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit '27ad0df013e7eac9b7b9b6b207832f5ca3bf77e3':
  docs: tweak table headers for config qualifiers
 2011-04-29 15:09:23 -07:00
James Dong
32a4f90171 am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'a1f6a09a86f4acd2147d4f1110eedc6643bbf80b':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 15:09:14 -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