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

35111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
6cf9c39452 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -07:00
Sylvain Fonteneau
a71354d766 Enable presence check at application level using 
RawTagConnection.isConnected() method.

Also needs packages/apps/Nfc to be updated.

Change-Id: I726e88853e2c4b348f3b87b7574bc6eded7f5b7c
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:52 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup. 
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-21 03:54:51 -07:00
Hung-ying Tyan
5d9e3bbb9d Fix connect duration for un-established SIP calls. 
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
 2010-10-21 15:54:46 +08:00
James Dong
8ad6335d2c am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread 
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
 2010-10-20 21:28:38 -07:00
Mathias Agopian
63ac8f5377 am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread 
Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp

* commit '2b2da52608303b149d22418865e67c8030c70e73':
  Add a test application to dump all the EGLConfig available
 2010-10-20 21:28:34 -07:00
Mathias Agopian
4ceee5a6b0 am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 
Merge commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381' into gingerbread-plus-aosp

* commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
 2010-10-20 21:28:29 -07:00
Mathias Agopian
fb31036fd8 am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread 
Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.
 2010-10-20 21:28:25 -07:00
James Dong
fa7a87fb4b Merge "File writer size estimation improvement" into gingerbread 2010-10-20 20:07:57 -07:00
Mathias Agopian
2b2da52608 Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-20 20:05:28 -07:00
Mathias Agopian
73655bd2d3 Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 2010-10-20 20:04:52 -07:00
Mathias Agopian
583fefc8dc Merge "Use the context_priority extension when present." into gingerbread 2010-10-20 20:04:46 -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
Gilles Debunne
97dfd3492f Fix to display first tab as selected on tab widget creation. 
Change-Id: Icc6ec78d2392a300b43b522b3dc18d0ab1223116
 2010-10-20 18:26:57 -07:00
Mathias Agopian
6d90e89afa am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread 
Merge commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp

* commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72':
  software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
 2010-10-20 18:22:17 -07:00
Jean-Baptiste Queru
843ff92bb0 resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp 
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
 2010-10-20 18:16:57 -07:00
Mathias Agopian
a0795fc9bd Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread 2010-10-20 18:00:43 -07:00
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