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

34742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
c9923876d4 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID 
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
 2010-10-20 17:21:43 -07:00
Dianne Hackborn
674b856c15 am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
 2010-10-20 17:14:59 -07:00
Dianne Hackborn
fb2cd0aa9d Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Mathias Agopian
cd1e02d460 Add a test application to dump all the EGLConfig available 
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
 2010-10-20 17:10:47 -07:00
Brad Fitzpatrick
cf8918874d Revert "Add length-equality test in String operator== checks." 
This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
 2010-10-20 17:06:28 -07:00
Jean-Baptiste Queru
5d919b4387 Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
c20f205d10 am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0" 
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp

* commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
  BatteryService: Set bool to true if sysfs entry is not 0
 2010-10-20 16:45:50 -07:00
Jean-Baptiste Queru
5bfef1ba05 Merge "BatteryService: Set bool to true if sysfs entry is not 0" 2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
eceace47c5 am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 
Merge commit '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp

* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
  Fix FastScroller overlay position bug
 2010-10-20 16:33:51 -07:00
Jean-Baptiste Queru
81925e665c Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -07:00
Jamie Gennis
6913c6176b Fix a copy & paste logging error. 
This change corrects the name of a variable used in a logging macro,
allowing AwesomePlayer.cpp to build with verbose logging enabled.

Change-Id: Ie23fe0fb17f08ac43348cee3209bfe68088e856e
 2010-10-20 16:05:40 -07:00
Jamie Gennis
7eac136a39 Merge "Fix the non-ANW video decode path." 2010-10-20 16:04:12 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL. 
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
 2010-10-20 16:03:37 -07:00
Jamie Gennis
dbfb32e902 Fix the non-ANW video decode path. 
The BufferInfo::mOwnedByNativeWindow field was not being initialized in
the non-ANativeWindow video decode path.

Change-Id: If2f6249902a08690f6c62ef30791b9979050c0e5
 2010-10-20 15:53:59 -07:00
Wink Saville
4b7ba09c8b Change removeNetowrk to a synchronous channel call. 
Change-ID: Iad0380d56972826615e044fa2aaee418b617d732
 2010-10-20 15:52:42 -07:00
Wink Saville
1b35f942ec Merge "Add AsyncChannel and AsyncService." 2010-10-20 15:51:23 -07:00
Brad Fitzpatrick
fb3132e866 Merge "Add length-equality test in String operator== checks." 2010-10-20 15:47:04 -07:00
Wink Saville
d20a5d6b5a Add AsyncChannel and AsyncService. 
Change-Id: Ie6f9aed58f49defcd1c051611ce791e2e62a9474
 2010-10-20 15:17:28 -07:00
Andreas Huber
fb26350c00 Merge "If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset()." 2010-10-20 15:13:09 -07:00
Andreas Huber
eaf2c5a5c3 If we basically finished the preparation phase and are only buffering enough data to start playback, cancel this early on reset(). 
Change-Id: I71a59d5e019e7b9ec3d9375d6231cc301ad3999b
 2010-10-20 15:12:05 -07:00
Andreas Huber
65b51941e3 Merge "Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF." 2010-10-20 15:11:02 -07:00
Brad Fitzpatrick
e28210d401 Add length-equality test in String operator== checks. 
Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
 2010-10-20 15:03:49 -07:00
Andreas Huber
a0b442edbf Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF. 
Change-Id: I57eaefdc4b300a8f56bbe5cf3a34c424e8efe63a
related-to-bug: 3084183
 2010-10-20 15:01:01 -07:00
Andreas Huber
1dcb42b772 Merge "Make sure we can encode the size of the codec specific data in a single byte." 2010-10-20 14:33:06 -07:00
Andreas Huber
1df9a7b133 Make sure we can encode the size of the codec specific data in a single byte. 
Change-Id: If7680cbfb380180c8dd6d6019b9c6c67661e468d
 2010-10-20 14:29:41 -07:00
Kenny Root
c925944733 am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 
Merge commit 'ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp

* commit 'ddf8fe505636d3b4435cb9952266765aab20b86d':
  Fix isUsbMassStorageConnected() will always return true
 2010-10-20 14:13:21 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Kenny Root
ddf8fe5056 Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 2010-10-20 14:10:00 -07:00
Dianne Hackborn
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
a747b43993 am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp

* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-20 14:04:00 -07:00
Hung-ying Tyan
bdc15d8b43 am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp

* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-20 14:03:54 -07:00
Hung-ying Tyan
940b4d1c45 am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
 2010-10-20 14:03:43 -07:00
Jeff Hamilton
e55806a555 am 23392a84: Fix the build. 
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
 2010-10-20 13:57:26 -07:00
Hung-ying Tyan
d691b36cde am 6fe795ec: Do another contact lookup if the first one fails and... 
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
 2010-10-20 13:57:20 -07:00
Hung-ying Tyan
fd0ba81c02 am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-20 13:56:59 -07:00
Dianne Hackborn
b50187237c am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp

* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-20 13:56:03 -07:00
Hung-ying Tyan
5102856947 am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
 2010-10-20 13:54:25 -07:00
Dirk Dougherty
18cbc0e58a am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp

* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-20 13:54:09 -07:00
James Dong
e6aaa3da33 Merge "Fix an issue where the video size was incorrectly retrieved from preview size" 2010-10-20 13:48:14 -07:00
Vasu Nori
c63c320c09 Merge "remove duplicate code" 2010-10-20 13:46:19 -07:00
Vasu Nori
ef7e33b9b8 remove duplicate code 
Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
 2010-10-20 13:37:33 -07:00
Justin Ho
d5aaff548d Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Amith Yamasani
b1818e83f4 Update dropdown colors and list readability for SearchView. 
Dismiss IME on launching suggestion.
 2010-10-20 13:32:24 -07:00
Hung-ying Tyan
4056ab97be Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 2010-10-20 13:28:02 -07:00
Hung-ying Tyan
6037a056ea Fix n-way conf call in SipPhone. 
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
 2010-10-21 03:59:04 +08:00
Justin Ho
6312822111 DO NOT MERGE - Updated media playback transport controls (b/3116268) 
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
 2010-10-20 12:44:46 -07:00
Hung-ying Tyan
e87b644402 Add permission requirements to SipAudioCall and SipManager javadoc. 
Bug: 3116259

Change-Id: I00a033794e9d3e1c2d2ccfe4e612cd50003ec2ee
 2010-10-21 03:27:20 +08:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Jeff Hamilton
23392a84bc Fix the build. 
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
 2010-10-20 14:20:29 -05:00
Irfan Sheriff
4f5f7c9683 Fix wake and scan behavior 
- Add wakelock for driver start/stop to ensure a wifilock
  acquisition kick starts driver. Also cleaned up state machine
  driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
  reconnections when wifilock exists or when user chooses
  never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
 2010-10-20 12:04:21 -07:00