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

27965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
811d66f149 am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
 2010-08-04 20:36:09 -07:00
Daniel Sandler
9b87770f53 Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Chung-yih Wang
b631dcf3eb Move SIP telephony related codes to framework. 
+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
 2010-08-05 11:11:58 +08:00
Oscar Montemayor
e728ca93fd Updated API after unhinding a hidden element. 
Change-Id: Ie76702bf0bf161f6ebb5a48db7d4ac89364ebafb
 2010-08-04 19:56:48 -07:00
Chung-yih Wang
bbd1a04c62 am 8c503569: Merge "Move the sip related codes to framework." into gingerbread 
Merge commit '8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp

* commit '8c5035696b0aaf30ae49594b845f663fe633ac88':
  Move the sip related codes to framework.
 2010-08-04 19:30:37 -07:00
Chung-yih Wang
8c5035696b Merge "Move the sip related codes to framework." into gingerbread 2010-08-04 19:28:23 -07:00
Chung-yih Wang
363c2ab82c Move the sip related codes to framework. 
Change-Id: Ib81dadc39b73325c8438f078c7251857a83834fe
 2010-08-05 10:25:53 +08:00
John Wang
efd938f77a am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread 
Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp

* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
  Add register methods in CallManager "do not merge"
 2010-08-04 18:56:37 -07:00
John Wang
62f066a14a Merge "Add register methods in CallManager "do not merge"" into gingerbread 2010-08-04 18:54:55 -07:00
Oscar Montemayor
8063589c6c Removed extra parameter tag in JavaDocs 
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
 2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d Merge "Fix for SDK breakage with hidden field." 2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1 Fix for SDK breakage with hidden field. 
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
 2010-08-04 18:24:14 -07:00
Scott Main
c9de8c34a3 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
 2010-08-04 18:05:26 -07:00
Scott Main
ef9fd39d73 am 769f9b89: am 5b86de94: fix doc bugs 
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
  fix doc bugs
 2010-08-04 18:05:22 -07:00
Vasu Nori
b6d1437f32 fix build breakage 
eclipse doesn't complain but our build does..

Change-Id: If0289b68e91e7eb2ae7a9b7bd90d5cb6b728e944
 2010-08-04 18:05:00 -07:00
Scott Main
97c2d840a1 am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread

* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
  fix some doc errors in the resources;
 2010-08-04 18:02:25 -07:00
Scott Main
769f9b8980 am 5b86de94: fix doc bugs 
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
 2010-08-04 18:02:18 -07:00
Adam Powell
8e552630e7 Let action modes overlay window content 
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
 2010-08-04 17:42:44 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources; 
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
 2010-08-04 17:33:33 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Scott Main
5b86de94a1 fix doc bugs 
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
 2010-08-04 17:07:36 -07:00
Kenny Root
aec3e36fd4 am 2d817f75: Free scanBuf in ZipFileRO 
Merge commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7' into gingerbread-plus-aosp

* commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7':
  Free scanBuf in ZipFileRO
 2010-08-04 17:04:29 -07:00
Kenny Root
2d817f7596 Free scanBuf in ZipFileRO 
In the success case, the 65kB scanBuf was not freed!

Also, get rid of annoying complaints about ssize_t from printf in error
cases.

Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
 2010-08-04 16:53:56 -07:00
Manuel Roman
96183e16e4 Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown" 2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71 Merge "Device Policy Manager changes to enable Global Proxy." 2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a Merge "Avoid hostname lookup in NetworkProperties" 2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark. 
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
 2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37 Device Policy Manager changes to enable Global Proxy. 
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
 2010-08-04 16:01:56 -07:00
Marco Nelissen
533dc7866c am 7d146197: Merge "Fix divide by zero." into gingerbread 
Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp

* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
  Fix divide by zero.
 2010-08-04 15:39:55 -07:00
Xia Wang
a69fbc8eff Switch to new enum definition in RilCmds 
Change-Id: Id6173d92a1c8d136b037448e2df55ea9ef49d34e
 2010-08-04 15:39:24 -07:00
Marco Nelissen
7d14619787 Merge "Fix divide by zero." into gingerbread 2010-08-04 15:37:37 -07:00
Romain Guy
42d530f18a Merge "Fix native crash in SkiaShader." 2010-08-04 15:35:10 -07:00
Romain Guy
6c07daf86c Fix native crash in SkiaShader. 
Bug #2893733

Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
 2010-08-04 15:35:18 -07:00
Marco Nelissen
0fc9f34d94 Fix divide by zero. 
Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
 2010-08-04 15:29:26 -07:00
Irfan Sheriff
1cf56ab9c6 Avoid hostname lookup in NetworkProperties 
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
 2010-08-04 15:15:49 -07:00
Kenny Root
d6dc45c30c am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp

* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
  Failure to move .dex in eng builds is not fatal
 2010-08-04 15:03:56 -07:00
Kenny Root
125816a2a8 Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 2010-08-04 15:01:56 -07:00
Alex Sakhartchouk
f61f33dd38 Merge "Added ability to set font color. Propagating the name of meshes and allocations from native a3d to java" 2010-08-04 14:48:26 -07:00
Alex Sakhartchouk
fb10c16a05 Added ability to set font color. 
Propagating the name of meshes and allocations from native a3d to java

Change-Id: If781f55340b5369459610e5e92ea69e240dcd24e
 2010-08-04 14:45:48 -07:00
jsh
0b4e3ad356 am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread 
Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp

* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
  Add support for PSC of serving cell.
 2010-08-04 14:35:44 -07:00
jsh
82cadee3ca Merge "Add support for PSC of serving cell." into gingerbread 2010-08-04 14:32:19 -07:00
Nipun Kwatra
a8bd3a303e Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters." 2010-08-04 14:23:54 -07:00
Andreas Huber
ac8e7060e0 am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp

* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
 2010-08-04 14:18:58 -07:00
Andreas Huber
86d2c088f1 Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 2010-08-04 14:16:20 -07:00
Andreas Huber
1f513d8821 am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
 2010-08-04 14:15:23 -07:00
Kenny Root
1cd6340a72 am 50871525: Add more debugging to installd 
Merge commit '508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp

* commit '508715259c332613240b2399c77d35ea7214f91a':
  Add more debugging to installd
 2010-08-04 14:12:52 -07:00
Andreas Huber
1564455518 Don't return a decoder error if the encoded stream does not start with SPS/PPS. 
Change-Id: I960ada0c53f8ffe413ecd07c2c754a996841f592
 2010-08-04 14:08:14 -07:00
Brad Fitzpatrick
85d21bc6e1 am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread 
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'

* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
  Usage Stats: don't block writing stats to disk.
 2010-08-04 14:07:55 -07:00
Andreas Huber
c17f35dd92 Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 2010-08-04 14:06:12 -07:00
Andreas Huber
426b650e1b Specification of codec specific data as part of the session description is now optional. 
Change-Id: Ie1953909e1d241381add3cc82a7a1f7d7d1540f2
 2010-08-04 14:04:31 -07:00