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

34560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
4ef36afa32 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-21 10:55:21 -07:00
Hung-ying Tyan
4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
 2010-10-21 10:53:49 -07:00
Mathias Agopian
0d4e658bad am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 
Merge commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5'

* commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2010-10-21 10:47:32 -07:00
Mindy Pereira
9a9849ac7f am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5'

* commit '62ad0db62393073a8cda9b21e4ae1506954c10a5':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-21 10:47:15 -07:00
Scott Main
9c09ebd2b4 am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df'

* commit 'b619e3332d36a8b5c56da6530834be8cc69272df':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-21 09:56:04 -07:00
Jean-Baptiste Queru
3317c6db00 am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102'

* commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102':
  jni: Remove duplicated jniThrowException()
 2010-10-21 09:54:58 -07:00
Chung-yih Wang
16f5d6ee79 am aefcdde4: am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService. 
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6'

* commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6':
  Periodically scan wifi when wifi is not connected and wifi lock is
 2010-10-21 09:51:01 -07:00
Hung-ying Tyan
9d6d17fcd8 am 35d9e770: am 0a6e717f: Handle dialing a SIP call to self. 
Merge commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2'

* commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2':
  Handle dialing a SIP call to self.
 2010-10-21 09:50:50 -07:00
Brad Fitzpatrick
a294faffc9 am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6'

* commit '6799864d6c9744e4c5133a90410576b577d65de6':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-21 09:47:27 -07:00
Joe Onorato
749984798c fix bad merge 
Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81
 2010-10-21 11:38:25 -04:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master 
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
 2010-10-21 07:39:10 -07:00
Chris Tate
a376d030a2 Merge "Fix obtain() when the pool is still empty" 2010-10-20 19:04:34 -07:00
Chris Tate
c02c7af0ec Fix obtain() when the pool is still empty 
Fixes bug 3116798

Change-Id: I187e79892cd2b60173ef4ebef5d2eab56eb5eb42
 2010-10-20 19:01:55 -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
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
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
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
Amith Yamasani
b1818e83f4 Update dropdown colors and list readability for SearchView. 
Dismiss IME on launching suggestion.
 2010-10-20 13:32:24 -07: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
James Dong
26e54e258f Fix an issue where the video size was incorrectly retrieved from preview size 
bug - 3115814

Change-Id: I6aa59b3182ceee35c6d6ef54ff520f81077873f0
 2010-10-20 11:44:15 -07:00
Jamie Gennis
92f987a07a Merge "Add decode-to-ANativeWindow support to Stagefright." 2010-10-20 11:38:28 -07:00
Ben Murdoch
be00398005 Merge "Set the unique id of the AutoFill profile WebKit can read it" 2010-10-20 11:35:47 -07:00
Jamie Gennis
58a36adac1 Add decode-to-ANativeWindow support to Stagefright. 
This change adds support to Stagefright for doing OMX video decoding directly
into buffers dequeued from an ANativeWindow.  It does this by registering the
dequeued buffers with the OMX component using an Android-specific OMX
extension, and then exchanging buffers between the OMX component and the
ANativeWindow.

Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
 2010-10-20 11:03:30 -07:00
Dmitry Shmidt
138f10e3f1 wifi: Allow dual-band support 
Change-Id: I90e421efca783080261789378ef6054ac394c1e2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2010-10-20 11:03:06 -07:00
Ben Murdoch
b1b82a8df8 Set the unique id of the AutoFill profile WebKit can read it 
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.

Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
 2010-10-20 18:56:23 +01:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Ben Murdoch
9532677ad8 Merge "Implement file downloads for Chrome HTTP stack (Java side)" 2010-10-20 08:36:17 -07:00
Iain Merrick
d77f9b7b39 Implement file downloads for Chrome HTTP stack (Java side) 
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.

See matching C++ change in external/webkit (I81300400)

Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
 2010-10-20 15:55:12 +01:00
Leon Scroggins
45afb65561 Merge "Use primary color for matches string." 2010-10-20 06:46:48 -07:00
Jack Wang
b1d042dc31 Merge "Added RepetitiveTest annotation and test runner support" 2010-10-20 03:23:49 -07:00
James Dong
5ff9980ac5 Merge "Make camera source ready for handling meta-data video buffers." 2010-10-19 23:54:57 -07:00
James Dong
820b2bb66e Merge "Camera framework change required for 0-memcpy recording" 2010-10-19 23:54:38 -07:00
James Dong
ab79d1febc Make camera source ready for handling meta-data video buffers. 
bug - 3042125

Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
 2010-10-19 23:11:29 -07:00
James Dong
38311859e8 Camera framework change required for 0-memcpy recording 
bug - 3042125

Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
 2010-10-19 23:07:08 -07:00
Hung-ying Tyan
e894ff7a76 am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
  Return display name in SipConnection.getCnapName().
 2010-10-19 23:03:25 -07:00