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

28099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nipun Kwatra
b70c1db70f Adding parseSizesList, getSupportedPreviewSizes to CameraParameters. 
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.

Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
 2010-08-04 14:04:07 -07:00
Chet Haase
bb688d6f37 Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)" 2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433 Fix NPE in onAnimationEnd when using Sequencer.after(long) 2010-08-04 13:49:39 -07:00
Jeff Hamilton
397e3a7bf7 Merge "Improve the documentation for the browser provider, and a few small cleanups." 2010-08-04 13:44:17 -07:00
Scott Main
53adc3c296 Merge "add droiddoc flag for honeycomb apis (for reference filtering)" 2010-08-04 13:35:39 -07:00
Kenny Root
e2f7417529 Failure to move .dex in eng builds is not fatal 
When moving between program locations or application names, the .dex
file is moved by installd. However, in engineering builds, the
applications are run through dexopt on-demand. If the .dex file fails to
move, we can ignore it because it's most likely because the .dex file
does not exist yet.

Change-Id: Id5c4dbfa33f19c976acd9f184ccd637752326629
 2010-08-04 13:35:33 -07:00
Vasu Nori
0c9e14aa4a add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown 
Change-Id: I3dd69b6907d68b7c1184139f22297ab92337f043
 2010-08-04 13:34:34 -07:00
Jeff Hamilton
31d95db2cc Improve the documentation for the browser provider, and a few small cleanups. 
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
 2010-08-04 15:26:25 -05:00
Kenny Root
508715259c Add more debugging to installd 
If a command to installd fails, it would be nice to know exactly why.
Log failures and the errno associated with the failures.

Change-Id: Ia3122675f243037c556d3a49d06da7e03b8c59f6
 2010-08-04 13:15:12 -07:00
Daniel Sandler
b64ffdf0aa Merge "Cleaning up the notification data structures." 2010-08-04 13:12:15 -07:00
Mike Lockwood
c3cc7011c2 Merge changes I085cb3cf,Ied1cddc6 
* changes:
  MTP: Add support for syncing MTP playlists
  MTP: Fix some thread safety issues in MTP server start/stop sequence.
 2010-08-04 13:02:06 -07:00
Vasu Nori
a7dd5eab33 requery() return value should be checked 
if not checked and if the cursor continues to be used, it will result in
bug:2529736

Change-Id: I920f665643561374c2211acded6cc31fa8931909
 2010-08-04 12:54:48 -07:00
Brett Chabot
f71925c84f Merge "resolved conflicts for merge of 10928c37 to master" 2010-08-04 12:04:54 -07:00
Brett Chabot
f22e876393 resolved conflicts for merge of 10928c37 to master 
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
 2010-08-04 12:03:46 -07:00
Chet Haase
df030d2c16 View x/y properties now feed into matrix translation 
Change-Id: I35d8953ab6c7a511cdf90f3f94a4a1b5ef549fc3
 2010-08-04 12:01:51 -07:00
Andreas Huber
57648e4eec 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. 
Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
 2010-08-04 11:49:24 -07:00
Jaikumar Ganesh
c4ed734bd8 am 737998f5: Merge "Add Blocked Device property." into gingerbread 
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp

* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
  Add Blocked Device property.
 2010-08-04 11:36:03 -07:00
Jaikumar Ganesh
737998f595 Merge "Add Blocked Device property." into gingerbread 2010-08-04 11:28:55 -07:00