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

28885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Shan Emily Lau
751cc4245f am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
cd08ada7f1 am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:08:14 -07:00
Marco Nelissen
67c7a4ae2e Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:06:39 -07:00
Nick Pelly
222f489fc0 am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:43:19 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code. 
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
 2010-10-27 10:23:59 -07:00
Nick Pelly
6d55e1342f Make best effort attempt to recover NFC service when it dies. 
Retrieve the service again from ServiceManager on RemoteException.

Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-27 01:15:32 -07:00
Andreas Huber
e1e8274588 am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:23:54 -07:00
Andreas Huber
2088e371ed Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread 2010-10-26 16:21:48 -07:00
Justin Ho
1f61ad1728 am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:08:13 -07:00
Justin Ho
3810c08bbc Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread 2010-10-26 16:06:28 -07:00
Justin Ho
95ce5b20c8 DO NOT MERGE - Fixing ringtones that were put in as notifications 
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
 2010-10-26 15:34:07 -07:00
Andreas Huber
0a612889b5 Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise. 
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
 2010-10-26 15:06:44 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly. 
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
 2010-10-26 14:36:09 -07:00
Mathias Agopian
85c5ca07b9 am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:22:12 -07:00
Mathias Agopian
1b98a9e6a9 am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:19:48 -07:00
Mathias Agopian
d9588e9c3c am a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:19:43 -07:00
Mathias Agopian
2f19f56ac5 Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread 2010-10-26 12:18:32 -07:00
Mathias Agopian
5219dd8e29 Merge "add format parameter to setBufferGeometry" into gingerbread 2010-10-26 12:18:19 -07:00
Mathias Agopian
a7b745ca75 Merge "fix eglChooseConfig() for special attributes." into gingerbread 2010-10-26 12:18:07 -07:00
Jeff Hamilton
f56aac4b6e am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:16:10 -07:00
Jeff Hamilton
d8cf2125c1 Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:14:17 -07:00
Xavier Ducrohet
a44a5e02d2 am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:10:28 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code. 
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
 2010-10-26 14:09:48 -05:00
Xavier Ducrohet
1b6180ec31 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:09:18 -07:00
Xavier Ducrohet
25e96ce7b9 Fix rendering of digitalClock/Gallery in Eclipse editors. 
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
 2010-10-26 11:18:39 -07:00
Justin Ho
cc8de576cd am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:11:12 -07:00
Justin Ho
5a147d083c Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Justin Ho
34952c0121 DO NOT MERGE - Fixing capitalized ringtone metadata only 
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
 2010-10-26 09:05:06 -07:00
Mike Lockwood
1b571bd3e9 am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:36:24 -07:00
Mike Lockwood
1d28a84059 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
ecae8a43b7 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
1a58d9c398 Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Joe Onorato
a1e7474498 am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:24:41 -07:00
Jeff Hamilton
79fb6449a1 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Mike Lockwood
9e3191d16c Location Manager: Fix LocationManager.getBestProvider filtering. 
getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-26 10:01:55 -04:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895. 
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
 2010-10-25 19:45:39 -07:00
Joe Onorato
11e2e9b0c2 Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-25 18:48:08 -07:00
Jean-Baptiste Queru
5574453022 Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 17:28:29 -07:00
Jean-Baptiste Queru
66a5d695ed resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp 
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
 2010-10-25 17:27:16 -07:00
Scott Main
f0b3fa60db am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp

* commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
  update featured videos
 2010-10-25 17:23:10 -07:00
Scott Main
3d40cd5055 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items 
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
 2010-10-25 17:15:50 -07:00
Mathias Agopian
b9737a1d1b Updade Surface (ANativeWindow) format based on its buffers format 
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.

Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
 2010-10-25 17:08:37 -07:00
Justin Ho
41d21efd61 am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 
Merge commit '044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp

* commit '044df235c86ac69bb0e56cb4387e111ec276276e':
  DO NOT MERGE - Updated ringtone assets for crespo
 2010-10-25 16:50:34 -07:00
Justin Ho
044df235c8 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Gloria Wang
965f960eca Merge "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-10-25 16:39:12 -07:00
Justin Ho
6a83d37769 DO NOT MERGE - Updated ringtone assets for crespo 
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
 2010-10-25 16:38:41 -07:00
Joe Malin
96bdc50010 am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread 
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp

* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
  Doc Change: Revert NotePad sample test package
 2010-10-25 16:22:46 -07:00