ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,234 Commits 2 Branches 0 Tags 54 MiB
86a68a6d34
Commit Graph

17234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
86a68a6d34 am 04b4f781: am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 
Merge commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2'

* commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2':
  New API for high-priority Notifications and full-screen alerts.
 2010-06-17 13:27:34 -07:00
Daniel Sandler
3e760ed7dd am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp

* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
  New API for high-priority Notifications and full-screen alerts.
 2010-06-17 13:25:56 -07:00
Daniel Sandler
ca3cb3d702 Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 2010-06-17 13:23:59 -07:00
Dave Sparks
6a4b1abbfd am c05c83e2: am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly hig 
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'

* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
  TimedEventQueue is apparently important for glitch-free media playback, and so
 2010-06-17 12:46:07 -07:00
Scott Main
3da5b04e2f am b8ce7bca: am 78e6622f: am 821ca518: docs: edits to resources doc 
Merge commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234'

* commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234':
  docs: edits to resources doc
 2010-06-17 12:46:03 -07:00
Scott Main
0ccab340ee am c65d4c10: am d22bffdf: am bccedb03: docs: update dashboard again 
Merge commit 'c65d4c107f7c9bab731b198281109e576c2f6956'

* commit 'c65d4c107f7c9bab731b198281109e576c2f6956':
  docs: update dashboard again
 2010-06-17 12:45:58 -07:00
Dan Morrill
a22366c536 am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. 
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
 2010-06-17 12:45:53 -07:00
Dave Sparks
3a9d7ca651 am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than norm 
Merge commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp

* commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17':
  TimedEventQueue is apparently important for glitch-free media playback, and so
 2010-06-17 12:42:24 -07:00
Scott Main
d8d1ff2af1 am 78e6622f: am 821ca518: docs: edits to resources doc 
Merge commit '78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp

* commit '78e6622fbb2bacdac68269b60cc694275ae132a4':
  docs: edits to resources doc
 2010-06-17 12:42:21 -07:00
Scott Main
8fbf364271 am d22bffdf: am bccedb03: docs: update dashboard again 
Merge commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059' into gingerbread-plus-aosp

* commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059':
  docs: update dashboard again
 2010-06-17 12:42:18 -07:00
Dan Morrill
7c59b61084 am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. 
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp

* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
 2010-06-17 12:42:14 -07:00
Dave Sparks
a02e07d879 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro 
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
 2010-06-17 12:37:15 -07:00
Scott Main
be6c121108 am 821ca518: docs: edits to resources doc 
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
 2010-06-17 12:37:06 -07:00
Scott Main
e79243be84 am bccedb03: docs: update dashboard again 
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
 2010-06-17 12:36:31 -07:00
Dan Morrill
2beceb7f98 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. 
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
 2010-06-17 12:36:17 -07:00
James Dong
095e865efc am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder 
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
 2010-06-17 11:50:46 -07:00
James Dong
6408e743e7 am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder 
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp

* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
 2010-06-17 11:49:17 -07:00
Adam Powell
a325510748 Merge "Merging ActionBar menu with options menu." 2010-06-17 11:38:36 -07:00
James Dong
9479e69028 am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
  Remove hard-coded number of audio channels in AudioSource
 2010-06-17 11:28:28 -07:00
James Dong
cab9de64e4 am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource
 2010-06-17 11:26:57 -07:00
James Dong
5c362805cc Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 2010-06-17 11:25:19 -07:00
Gilles Debunne
be79de628a Merge "Removed warnings in LayoutInflater." 2010-06-17 10:05:29 -07:00
Gilles Debunne
44e3366854 Merge "Index out of range problem in TextLine." 2010-06-17 10:05:11 -07:00
Dianne Hackborn
dd9316f9e2 am 9a1034aa: am 6b7b4845: Various improvements to battery stats collection 
Merge commit '9a1034aa9746b94ecb659ea849765a160bdf747e'

* commit '9a1034aa9746b94ecb659ea849765a160bdf747e':
  Various improvements to battery stats collection
 2010-06-16 19:55:12 -07:00
Dianne Hackborn
1cf651a192 am 6b7b4845: Various improvements to battery stats collection 
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp

* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
  Various improvements to battery stats collection
 2010-06-16 18:49:28 -07:00
Fabrice Di Meglio
7f3d253a9a Merge "Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)" 2010-06-16 17:01:48 -07:00
Gilles Debunne
dc58a3bc25 Merge "Suppressed warnings in TextView." 2010-06-16 16:29:53 -07:00
Dmitri Plotnikov
eb92178c5b Merge "Preventing cursor leaks when a query is interrupted" 2010-06-16 16:15:08 -07:00
Fabrice Di Meglio
15f68feabf Merge "Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)" 2010-06-16 15:35:31 -07:00
Brett Chabot
b4cb6343d5 am 685fcf36: am c95812e6: Merge "Move out all framework-tests classes." into gingerbread 
Merge commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48'

* commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48':
  Move out all framework-tests classes.
 2010-06-16 14:42:51 -07:00
Brett Chabot
f9a7e14afe am c95812e6: Merge "Move out all framework-tests classes." into gingerbread 
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp

* commit 'c95812e6cacaa14748c81323bac6561453991a24':
  Move out all framework-tests classes.
 2010-06-16 14:41:00 -07:00
Brett Chabot
9bdf9d6a53 Merge "Move out all framework-tests classes." into gingerbread 2010-06-16 14:39:41 -07:00
Irfan Sheriff
6a2d3681e1 am 1af48920: am f897b443: Fix driver stop check 
Merge commit '1af489205a3942630e6203237213e98ef53d4118'

* commit '1af489205a3942630e6203237213e98ef53d4118':
  Fix driver stop check
 2010-06-16 14:35:51 -07:00
Irfan Sheriff
af68c0ddee am f897b443: Fix driver stop check 
Merge commit 'f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp

* commit 'f897b443fed5c88c6b12e3fa1da72f231db67673':
  Fix driver stop check
 2010-06-16 14:31:54 -07:00
Dave Sparks
e9a36f1e11 Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo 2010-06-16 14:11:40 -07:00
Mason Tang
63bca99a94 Merge "Modified first animation and visibility change behavior for ViewFlipper" 2010-06-16 13:59:42 -07:00
Vasu Nori
bb9714f609 Merge "throw correct exception" 2010-06-16 12:30:48 -07:00
Patrick Scott
2e5e56b79b Merge "Move WebViewDatabase initialization into a background thread." 2010-06-16 11:58:13 -07:00
Robert Greenwalt
847ddc0318 Merge "Move the net transition wakelock to ConnService." 2010-06-16 11:07:59 -07:00
Adam Powell
59f55bd48d Merge "Fix bug 2771204" 2010-06-16 10:52:50 -07:00
Scott Main
9732a5cb53 am a0210f76: am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'a0210f76e451a0fede557e704832f605034584c4'

* commit 'a0210f76e451a0fede557e704832f605034584c4':
  docs: update dashboard
 2010-06-15 19:48:12 -07:00
Scott Main
1856316ca9 am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp

* commit 'c980ba25b0916d7c276c23e420195dd7959379a0':
  docs: update dashboard
 2010-06-15 19:45:00 -07:00
Scott Main
b49ec28380 am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
 2010-06-15 19:39:32 -07:00
Scott Main
b7310b28e2 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Romain Guy
abf143f550 Merge "Add new API to check whether a Bitmap was modified." 2010-06-15 18:06:47 -07:00
Jason Sams
69ba481fee Merge "Remove InvokeData and add ContextFinish to generate a sync point." 2010-06-15 17:12:51 -07:00
Jeff Brown
ac69c9607f am 2dfd2aa4: am 92266a78: Merge "More work in progress on native events." into gingerbread 
Merge commit '2dfd2aa413a91965c1a247980598c795db9b4c38'

* commit '2dfd2aa413a91965c1a247980598c795db9b4c38':
  More work in progress on native events.
 2010-06-15 16:50:12 -07:00
Jeff Brown
cedf09458d am 92266a78: Merge "More work in progress on native events." into gingerbread 
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp

* commit '92266a7894becc1cdf2298fd02380749ab036131':
  More work in progress on native events.
 2010-06-15 16:48:23 -07:00
Jeff Brown
c10612c77a Merge "More work in progress on native events." into gingerbread 2010-06-15 16:44:23 -07:00
Jeff Brown
54bc281639 More work in progress on native events. 
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher.  Also added some plumbing
that will be used to notify the framework about ANRs.

Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
 2010-06-15 16:43:18 -07:00