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

49893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
0be97d8b5e Temporarly disable auto-inbanding. 
Change-Id: Ia83389c094914f0bb69bff8f6965ae445c89de07
 2011-05-02 14:31:28 -07:00
Mike Lockwood
677cece131 Merge "MediaScanner: Fix bug in "no media" handling logic" 2011-05-02 14:19:43 -07:00
Dan Morrill
8325c3a891 Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change 
since file was renamed, making cherry-pick impossible.

Change-Id: Idc802af57fb9926a69ed52d4e776ef57d8b647c6
 2011-05-02 14:06:06 -07:00
Mike Lockwood
214f9db054 MediaScanner: Fix bug in "no media" handling logic 
Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: I30943222dc292818cff00ee8169be7a695eed174
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-02 17:04:19 -04:00
Irfan Sheriff
d713683f9f am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit 'd369d64ee7931726d479e60e64d76a31fdba4a8f':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 13:29:36 -07:00
Robert Greenwalt
db46fa25be am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
  Add RouteInfo objects for tracking routes.
 2011-05-02 13:29:22 -07:00
Robert Greenwalt
a47c40193f Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
d369d64ee7 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
 2011-05-02 12:26:52 -07:00
Wink Saville
a0449f03eb Resolve merge conflicts for merge of 21083066 to master. 
Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c
 2011-05-02 12:13:44 -07:00
Wink Saville
c56e87e721 am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
  Fix bug in RIL#getDataCallState.
 2011-05-02 12:05:02 -07:00
Wink Saville
210830664d am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE 
* commit '7e74c60db5261ea137c8f6672f8573873eb5814e':
  Enhance AsyncChannel.
 2011-05-02 11:51:36 -07:00
Wink Saville
0fa7d106d4 am aa44b52e: Fix bug in RIL#getDataCallState. 
* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
  Fix bug in RIL#getDataCallState.
 2011-05-02 11:51:20 -07:00
Irfan Sheriff
8ab6a6d415 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE 2011-05-02 11:49:46 -07:00
Robert Greenwalt
aa70f101e0 Add RouteInfo objects for tracking routes. 
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
 2011-05-02 11:17:30 -07:00
Wink Saville
7e74c60db5 Merge "Enhance AsyncChannel." into honeycomb-LTE 2011-05-02 10:47:05 -07:00
Wink Saville
0246bbc8d7 Enhance AsyncChannel. 
- Use  Protocol for BASE of CMD's.
- Add synchronous connect methods.
- Back port sha1 c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd from master

Change-Id: If0b3f6cbbb8d4268cad6ca19d26ab2ee42390d86
 2011-05-02 10:44:56 -07:00
Conley Owens
3a5c227279 am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
* commit 'a3dcd0a3f1b48fc0d675db7e32c27415a14f6d08':
  Adjust mBiggerTouchSlopSquare to the suitable value
 2011-05-02 10:37:40 -07:00
Conley Owens
e8141854dc am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m 
* commit 'dddaa56f793ad9ecb4e20df746f562ac7f24d158':
  Scolling using arrow keys with padding
 2011-05-02 10:28:26 -07:00
Conley Owens
f4c4a276e2 Merge commit 'f395e304' into m 
Conflicts:
	core/tests/coretests/src/android/text/TextUtilsTest.java

Change-Id: I7439f7f80cf91ff654c0ddd79c3e6b3808ba4784
 2011-05-02 10:25:55 -07:00
Conley Owens
a31b3f2650 am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit '08acaec6df66bd6a12b1e63016ed998abff4afdc':
  Fixed to draw texture when loadTexture() is called at first time
 2011-05-02 10:12:00 -07:00
Conley Owens
981db85bf2 am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
  Fixing wrong Japanese phone formatter.
 2011-05-02 10:11:56 -07:00
Conley Owens
e7cb25916c am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '1eb31b434fdc325c55b65ecf1783c63b2fdfa669':
  Fix memory leak of SkMovie class
 2011-05-02 10:11:52 -07:00
Conley Owens
3581c93393 am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 
* commit '64248af314593fe8ffed57ac9a0f43dede26bfc2':
  Implement support for ALT and SHIFT modifiers
 2011-05-02 10:11:48 -07:00
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
Wink Saville
aa44b52ee0 Fix bug in RIL#getDataCallState. 
Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
 2011-05-02 10:00:53 -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
9c4ba2580e Merge "Removing dead store; it was likely a relict of debuging code." 2011-05-02 09:53:25 -07:00
Eino-Ville Talvala
3773eef4e3 Add an auto-exposure lock feature to the Camera API. 
Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.

Hidden for now.

Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
 2011-05-02 09:36:06 -07:00
Irfan Sheriff
31be7cf4c7 Add DhcpStateMachine for interation with dhcpcd 
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
 2011-04-30 12:58:51 -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
a3dcd0a3f1 Merged "Adjust mBiggerTouchSlopSquare to the suitable value" 
Conflicts:
	core/java/android/view/ViewConfiguration.java

Change-Id: I74de006dbb19fd878591bc90955a1c6e74aa084e
 2011-04-29 17:49:06 -07:00
Conley Owens
dddaa56f79 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m 
Conflicts:
	core/java/android/widget/ScrollView.java

Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
 2011-04-29 17:35:29 -07:00
Conley Owens
f395e3042a am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 
* commit '19653c6440eaf7328ecbc01c3ca6d7a910906484':
  CHAR_SEQUENCE_CREATOR cannot handle null string
 2011-04-29 17:15:39 -07:00
Conley Owens
08acaec6df am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" 
* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
  Fixed to draw texture when loadTexture() is called at first time
 2011-04-29 17:15:35 -07:00
Conley Owens
737b5c58c9 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." 
* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
  Fixing wrong Japanese phone formatter.
 2011-04-29 17:15:13 -07:00
Conley Owens
1eb31b434f am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" 
* commit '718516f3b73468c480ef8d2283a1c80a6223658d':
  Fix memory leak of SkMovie class
 2011-04-29 17:15:09 -07:00
Conley Owens
64248af314 Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp 2011-04-29 17:12:22 -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
Alex Sakhartchouk
4a36b45c72 Moving renderscript GL code into the HAL 
This change affects
 - shaders
 - meshes
 - fonts
 - quad rendering

Change-Id: I2a53acb4cd1fa8f4c6e67668f6ee969f3d7f7aa1
 2011-04-29 16:49:08 -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