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

31047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
5bb3129c7e am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
a2616220d2 am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
5e57c2cf83 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Eric Fischer
f01b3cfa9a am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:17:17 -07:00
Eric Fischer
c0e5967fb9 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Masahiko Endo
25ccbb97ff Prevent NullPointerException cases while using SipService. 
Some SipService methods may return null, in such cases like no Wi-Fi
connection. Added minimum check to prevent NullPointerExceptions.

Change-Id: Ia7fae57ee893f2564cbfdedb6dc614938ab60ff7
Signed-off-by: Masahiko Endo <masahiko.endo@gmail.com>
 2011-08-01 16:24:59 +09:00
Derek Sollenberger
b7f09f28b9 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:53:09 -07:00
Derek Sollenberger
b7ed8471f1 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:50:11 -07:00
Derek Sollenberger
01caec8c41 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Derek Sollenberger
0e4afa1fb1 Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Michaël Burtin
42305c54c7 Fix getSwitchState according to device capabilities. 
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.

Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
 2011-07-29 15:28:02 +02:00
Mike Lockwood
5f7203eb25 am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
 2011-07-28 14:02:14 -07:00
Jeff Brown
d5d7e164d3 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
 2011-07-28 14:00:27 -07:00
Mike Lockwood
5a27a7543e am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
 2011-07-28 14:00:27 -07:00
Mike Lockwood
bd1dee94df Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Stephen Li
8efd74dbed gps: Adding ip address for AGps 
Change-Id: Ic590187d159853de2f1bd2912e159f0a00d8fb10
 2011-07-28 16:50:45 -04:00
Mike Lockwood
bf676d460d am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:25:34 -07:00
Mike Lockwood
7083ed44ee am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:23:01 -07:00
Mike Lockwood
0ff79e88e2 Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Xavier Ducrohet
0b45ca8884 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code
 2011-07-27 18:38:50 -07:00
Xavier Ducrohet
cd01ad7cc7 am 20339b24: Merge "Remove Debug Code" 
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code
 2011-07-27 18:36:17 -07:00
Xavier Ducrohet
20339b2439 Merge "Remove Debug Code" 2011-07-27 18:26:01 -07:00
Josiah Gaskin
7a09ccfb50 Remove Debug Code 
This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.

Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056
 2011-07-27 17:45:32 -07:00
Xavier Ducrohet
c682559d3c am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 14:01:23 -07:00
Xavier Ducrohet
4d21c7732c am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 13:59:57 -07:00
Xavier Ducrohet
4d1fa60bfe Merge "DO NOT MERGE. may fix build on some version of gcc" 2011-07-27 13:45:05 -07:00
Mathias Agopian
913a5a3cc6 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-07-27 11:31:57 -07:00
Dianne Hackborn
20bf46af14 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." 
* commit 'b0878223db87700cdc988a6d9197ca4e3c4772db':
  frameworks/base: Cap the number of toasts that a package can post.
 2011-07-21 22:37:13 -07:00
Dianne Hackborn
b0878223db am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." 
* commit '6800a80199477c90fc64af7211a177de06478a02':
  frameworks/base: Cap the number of toasts that a package can post.
 2011-07-21 22:35:32 -07:00
Dianne Hackborn
9ce1ecdfde am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" 
* commit '1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
  frameworks/base: unlink death notifications of Vibrate requests
 2011-07-21 22:26:20 -07:00
Dianne Hackborn
1a2fcea1a2 am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" 
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests
 2011-07-21 22:23:46 -07:00
Dianne Hackborn
6800a80199 Merge "frameworks/base: Cap the number of toasts that a package can post." 2011-07-21 22:21:19 -07:00
Dianne Hackborn
2f4698fda4 Merge "frameworks/base: unlink death notifications of Vibrate requests" 2011-07-21 22:18:47 -07:00
Xavier Ducrohet
55775e5f34 am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit 'e70b2b8fe0c265171f3a367a66c99b36c62567c7':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:25:50 -07:00
Xavier Ducrohet
e70b2b8fe0 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:23:18 -07:00
Xavier Ducrohet
9bcf26ea7a Merge "Layoutlib_create flag -p: don't change all accesses to public." 2011-07-21 16:17:03 -07:00
Kenny Root
e612c881ec am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:11:01 -07:00
Kenny Root
4f3a8db64d am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:09:05 -07:00
Kenny Root
3cf0398761 Merge "Continue idmap generation even if name lookup fails." 2011-07-21 13:05:03 -07:00
Robert Greenwalt
26ecc31f36 am 594745ab: am b9f87f19: Merge "First pass tying into per-interface DNS cache" 
* commit '594745abefe53abe7f577bbb3cc176d52ee00ba1':
  First pass tying into per-interface DNS cache
 2011-07-21 11:29:05 -07:00
Robert Greenwalt
594745abef am b9f87f19: Merge "First pass tying into per-interface DNS cache" 
* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
  First pass tying into per-interface DNS cache
 2011-07-21 11:28:01 -07:00
Robert Greenwalt
b9f87f1970 Merge "First pass tying into per-interface DNS cache" 2011-07-21 11:16:12 -07:00
Xavier Ducrohet
3a2d1c2351 am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
  Fix to compile for windows
 2011-07-20 18:53:08 -07:00
Xavier Ducrohet
ddb8e3b24b am 9bac0a9f: Merge "Fix to compile for windows" 
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
  Fix to compile for windows
 2011-07-20 18:49:46 -07:00
Xavier Ducrohet
9bac0a9f93 Merge "Fix to compile for windows" 2011-07-20 18:35:35 -07:00
Josiah Gaskin
9102165fd8 Fix to compile for windows 
This change includes a workaround for dirent.h on windows not
including d_type.

Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
 2011-07-20 18:22:26 -07:00
Xavier Ducrohet
ea9e6d24a4 am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:02:33 -07:00
Xavier Ducrohet
b582af31c7 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0bc12a0b13 Merge "Added Caching for PreProcessed PNGs" 2011-07-20 15:55:33 -07:00
Xavier Ducrohet
2c311be720 am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:27:39 -07:00