Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,755 Commits 3 Branches 0 Tags
d2f6c7fe735ffcdb67852c6a1287565a2afa412d
Commit Graph

26755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
d2f6c7fe73 am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 
Merge commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d'

* commit '3e5e21d4dc74751e64d17379c5563ece39a7e35d':
  StrictMode: gather and return violating stacks in Binder replies
 2010-07-15 23:05:39 -07:00
Brad Fitzpatrick
9555a1323e am cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread 
Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'

* commit 'cc52121c4f88e9feb8404937bcbfff6e73084666':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
 2010-07-15 23:05:35 -07:00
Christopher Tate
6ba776ad34 am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
 2010-07-15 23:05:27 -07:00
James Dong
085d0f55e6 am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder 
Merge commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd'

* commit '10f8baa46cc32f0024b3c65b1e6d0c01bf4ceefd':
  Initial check-in for software m4v_h263 encoder
 2010-07-15 23:04:48 -07:00
Shih-wei Liao
ebd6f94dbd Merge "Preparing for build system change. Fix the build error in http://b/issue?id=2781522." 2010-07-15 22:35:31 -07:00
Shih-wei Liao
a560d7a2fd Preparing for build system change. Fix the build error in http://b/issue?id=2781522. 
Change-Id: I4513504bb05de9bb82cd12d40045a7e4090edb3c
 2010-07-15 22:30:48 -07:00
Dmitri Plotnikov
90c50c4d7d Merge "Fixing NPE in CursorLoader" 2010-07-15 18:56:11 -07:00
Dmitri Plotnikov
4565d52bdd Fixing NPE in CursorLoader 
Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
 2010-07-15 18:24:07 -07:00
Jason Sams
6ea3b2a5da Merge "1st cut of ForEach and test." 2010-07-15 17:12:10 -07:00
Jason Sams
8f8a5724be 1st cut of ForEach and test. 
Change-Id: I6534569c8d26db8b9691666134a555c8bf94184e
 2010-07-15 17:11:13 -07:00
Fred Quintana
de41684c40 Merge "fix a bug where some accounts changed listeners don't see the new version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called." 2010-07-15 16:35:03 -07:00
Robert Greenwalt
0761cea3bf Merge "Fix Emulator boot." 2010-07-15 16:01:25 -07:00
Jaikumar Ganesh
28a8467e51 Merge "Handle Input and network signal changes for HID and tethering." 2010-07-15 16:00:02 -07:00
Jaikumar Ganesh
56d2613965 Handle Input and network signal changes for HID and tethering. 
Change-Id: I7f0c2884bb766189b41093bdcd6241f4540a31f3
 2010-07-15 15:58:34 -07:00
Robert Greenwalt
0a0ba099ed Fix Emulator boot. 
Catch a NPE that doesn't seem to happen on devices.

Change-Id: I47d599afbed76798d8d312a59e30b89664363e93
 2010-07-15 15:51:48 -07:00
Brad Fitzpatrick
3e5e21d4dc am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp

* commit '1772c34e5331a6456c8a93051192d19ff873c062':
  StrictMode: gather and return violating stacks in Binder replies
 2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
cc52121c4f am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread 
Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp

* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
 2010-07-15 15:44:41 -07:00
Brad Fitzpatrick
1772c34e53 Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread 2010-07-15 15:42:41 -07:00
Brad Fitzpatrick
c4b204bdc4 Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread 2010-07-15 15:42:12 -07:00
Alex Sakhartchouk
51b7ebc652 Merge "Populate java objects with native data from a3d file. Remove legacy constructor from programraster Make a3d object creation synchronous" 2010-07-15 15:19:07 -07:00
Christopher Tate
078ccbdbb9 am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
 2010-07-15 15:03:32 -07:00
Christopher Tate
2c40582a6c Merge "Add native C APIs for working with the Asset Manager" into gingerbread 2010-07-15 15:00:14 -07:00
Romain Guy
c96cdc9844 Merge "Add support for BitmapShader." 2010-07-15 14:45:37 -07:00
Romain Guy
d27977d1a9 Add support for BitmapShader. 
This change also fixes an issue with the clip and layers.

Change-Id: I5fd9832098d8cf7ae8eb781ff9bffe7defaea279
 2010-07-15 14:44:42 -07:00
Dianne Hackborn
4911b783aa Fix bug where loader listener would be registered twice. 
Also change LoaderManager to an interface.

Change-Id: Ife6d123e56cc6f63b6fe902afac35b2673761e60
 2010-07-15 14:43:13 -07:00
James Dong
10f8baa46c am 42ef0c71: Initial check-in for software m4v_h263 encoder 
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
  Initial check-in for software m4v_h263 encoder
 2010-07-15 14:37:33 -07:00
Christopher Tate
6cce32b6ad Add native C APIs for working with the Asset Manager 
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
 2010-07-15 14:28:21 -07:00
Alex Sakhartchouk
dfac814c18 Populate java objects with native data from a3d file. 
Remove legacy constructor from programraster
Make a3d object creation synchronous

Change-Id: Ic7d7547cf6eee6f9a7c6e3ee12cd104e80056a7b
 2010-07-15 14:02:54 -07:00
Jim Shuma
506821b406 Merge "Making Program*.Builder classes' setters return 'this'" 2010-07-15 13:43:52 -07:00
Jim Shuma
288c8711a6 Making Program*.Builder classes' setters return 'this' 
This is for better correspondence with the Builder pattern.
See also: Effective Java, 2nd edition.

Change-Id: Iecccd42be49dea2ed8e4b8cc38ce96379cf3c11c
 2010-07-15 13:42:02 -07:00
Robert Greenwalt
e80c492546 Merge "Don't cast CONNECTING msgs to CONNECTED." 2010-07-15 13:35:14 -07:00
James Dong
42ef0c715d Initial check-in for software m4v_h263 encoder 
Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
 2010-07-15 13:28:21 -07:00
Brad Fitzpatrick
5b747191ff StrictMode: gather and return violating stacks in Binder replies 
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.

Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
 2010-07-15 13:18:05 -07:00
Brad Fitzpatrick
727de40c6b More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync. 
Change-Id: Ia67cabcc17a73a0f15907ffea683d06bc41b90e5
 2010-07-15 13:18:05 -07:00
Dave Sparks
aaa7a0ce47 Merge "Add some javadoc to AudioRecord, plus updates based on code review comments." 2010-07-15 12:35:52 -07:00
Steve Howard
9db328463a am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:31:29 -07:00
Mike Lockwood
3864d243a9 Merge changes I93364c74,I5ca831b8 
* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid
 2010-07-15 12:31:08 -07:00
Steve Howard
203ec9fa6e am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:28:39 -07:00
Mike Lockwood
ff164a7d6f Exclude MTP implementation from simulator build 
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 15:27:38 -04:00
Steve Howard
d6343c26b8 Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Mike Lockwood
5a23f8c41e Fixes for simulator build on lucid 
strchr and strrchr now return const char* instead of char*

Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-15 15:02:52 -04:00
Scott Main
82e2b4cb51 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
 2010-07-15 11:54:15 -07:00
James Dong
892681e56e am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'

* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
  Support user-supplied timescales for authoring
 2010-07-15 11:54:10 -07:00
Joe Onorato
dcd077179c am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'

* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
  Clean up some style in the makefiles.
 2010-07-15 11:54:00 -07:00
Joe Onorato
0dff8d4afd am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'

* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:53:51 -07:00
Robert Greenwalt
74d99aabf2 Don't cast CONNECTING msgs to CONNECTED. 
Fixed some logic in TelephonyRegistry so its notion of the state of our connection is
preserved, but it still sends out proper CONNECTING msg on secondary APNS (ie, bringing
up mms while the default connection was already up - it used to send out two CONNECTING
msgs instead of one CONNECTING and one CONNECTED).

Fixes mms while on mobile data.

bug:2840564
Change-Id: I69159aa0f471396680615ce6b9785620d844968f
 2010-07-15 11:51:51 -07:00
Fred Quintana
743dfad2a5 fix a bug where some accounts changed listeners don't see the new 
version of the accounts because the accounts changed broadcast is
sent from within the transaction try block, thus before db.endTransaction()
is called.

bug: 2839034
Change-Id: I814c7de9998ba52b85256dd2f3f19104fba3049c
 2010-07-15 11:41:20 -07:00
Scott Main
4fd416880e am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
 2010-07-15 11:23:08 -07:00
Scott Main
5352d2378d am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
 2010-07-15 11:20:32 -07:00
James Dong
b068b47c6d am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
 2010-07-15 11:18:53 -07:00