ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,023 Commits 2 Branches 0 Tags 54 MiB
10eea1e277
Commit Graph

18023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
10eea1e277 am 2814ad25: Merge "LVM release 1.09 delivery" into gingerbread 
Merge commit '2814ad25578d1a52826464477da16217247c04e0' into gingerbread-plus-aosp

* commit '2814ad25578d1a52826464477da16217247c04e0':
  LVM release 1.09 delivery
 2010-09-10 10:26:51 -07:00
Eric Laurent
215af644b3 Merge "LVM release 1.09 delivery" into gingerbread 2010-09-10 10:24:02 -07:00
Erik
057da22c30 Merge branch 'gingerbread-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into gingerbread-plus-aosp 2010-09-10 10:07:25 -07:00
Robert Greenwalt
778f695119 am 34763928: Merge "add ART for inet connection condition" into gingerbread 
Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp

* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
  add ART for inet connection condition
 2010-09-10 10:06:54 -07:00
Robert Greenwalt
64c9bb57d9 Merge "add ART for inet connection condition" into gingerbread 2010-09-10 09:58:05 -07:00
Jean-Baptiste Queru
57cbf0857f resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp 
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
 2010-09-10 09:53:43 -07:00
Joseph Wen
1205c8be1b am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread 
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
 2010-09-10 02:35:50 -07:00
Joseph Wen
2e6dedaa6d Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Hung-ying Tyan
1444db6448 am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread 
Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
  SIP: add SipErrorCode for error feedback.
 2010-09-10 02:23:04 -07:00
Hung-ying Tyan
0d93a6efbc Merge "SIP: add SipErrorCode for error feedback." into gingerbread 2010-09-10 02:19:22 -07:00
Dianne Hackborn
eb7a4298e6 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread 
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
 2010-09-09 23:14:46 -07:00
Dianne Hackborn
f1481181ed Merge "DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!" into gingerbread 2010-09-09 23:12:24 -07:00
Dianne Hackborn
06c725e551 am a8512a71: Always set the scheduling group when starting a new thread. 
Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp

* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
  Always set the scheduling group when starting a new thread.
 2010-09-09 23:05:42 -07:00
Dianne Hackborn
9c82c48d52 Always set the scheduling group when starting a new thread. 
Change-Id: Ia33acf13fc3752707f3819928c36315e223fa1bd
 2010-09-09 22:12:25 -07:00
Dianne Hackborn
87005bc57f am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread 
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
 2010-09-09 21:34:44 -07:00
Dianne Hackborn
ca5b069671 am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread 
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
 2010-09-09 21:34:38 -07:00
Dianne Hackborn
4b9adfdb29 am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread 
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
 2010-09-09 21:34:33 -07:00
Dianne Hackborn
ad70b5ab4b Merge "Add toast when an app intercepts the launch of another app." into gingerbread 2010-09-09 21:31:34 -07:00
Dianne Hackborn
a632141971 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
faa2348d30 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Dirk Dougherty
09eec2e869 am a71d6994: am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit 'a71d69947d4a74730b17021b4c809d054d66c741' into gingerbread-plus-aosp

* commit 'a71d69947d4a74730b17021b4c809d054d66c741':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:59:57 -07:00
Dirk Dougherty
3a58916ce2 am 74a74d3c: Doc change: Fixes for toggle image and adt release date. 
Merge commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48' into gingerbread

* commit '74a74d3c355ec4bfa09bf32d6dd877233af09d48':
  Doc change: Fixes for toggle image and adt release date.
 2010-09-09 18:53:36 -07:00
Rich Cannings
a48f498d18 am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread 
Merge commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0' into gingerbread-plus-aosp

* commit '6bff8c7994f35c5b8021f1f3da43f70739f472e0':
  Remove the use of FileInputStream.available()
 2010-09-09 16:45:34 -07:00
Andreas Huber
a4ca36f9d5 am ff4c57ad: Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 
Merge commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1' into gingerbread-plus-aosp

* commit 'ff4c57ade41c1c5c5f79088f6cef0fc1142c25f1':
  TimedEventQueue now explicitly sets its scheduling policy to foreground as it should.
 2010-09-09 16:42:17 -07:00
Rich Cannings
a13697f701 Merge "Remove the use of FileInputStream.available()" into gingerbread 2010-09-09 16:41:29 -07:00
Andreas Huber
8c423e61be Merge "TimedEventQueue now explicitly sets its scheduling policy to foreground as it should." into gingerbread 2010-09-09 16:39:09 -07:00
Jaikumar Ganesh
e35258f379 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
 2010-09-09 16:05:43 -07:00
Mike Lockwood
d4225c0e57 am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 
Merge commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458' into gingerbread-plus-aosp

* commit '76e4fa19264793e3ed7e2ee7afccfc808a1a7458':
  Only pulse notification light if a new notification has been received since the screen was last turned off
 2010-09-09 16:05:38 -07:00
Henrik Backlund
acb85f02e5 am a79c8291: Fix to get A2DP to connect after unpairing 
Merge commit 'a79c82918e3df38197cd4c81d10049401485036e' into gingerbread-plus-aosp

* commit 'a79c82918e3df38197cd4c81d10049401485036e':
  Fix to get A2DP to connect after unpairing
 2010-09-09 15:20:28 -07:00
Jaikumar Ganesh
e3138edec6 Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 2010-09-09 15:18:36 -07:00
Jean-Baptiste Queru
afdf77bb9c Merge " Initial contribution from Sony Corporation." 2010-09-09 14:22:50 -07:00
Mike Lockwood
738ba833cb Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread 2010-09-09 14:02:19 -07:00
Gilles Debunne
704d06ee0c am 47fa8e80: Fix for an IndentOutOfBounds in TextField. 
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
 2010-09-09 12:14:59 -07:00
Gilles Debunne
dc0174105d am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread 
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
 2010-09-09 12:00:52 -07:00
Mathias Agopian
bae7b39496 am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
 2010-09-09 11:58:14 -07:00
Gilles Debunne
29d6cb8e31 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00
Mathias Agopian
55f31ddfc7 Merge "option to enable multisampling" into gingerbread 2010-09-09 11:55:00 -07:00
Mathias Agopian
8296221138 option to enable multisampling 
multisampling can be enabled by specifying the number of
samples desired on the command line.

Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
 2010-09-09 11:53:17 -07:00
Steve Howard
837d66f48c am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread 
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
 2010-09-09 11:26:08 -07:00
Mathias Agopian
358fea99da am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread 
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp

* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
  Fix a few typos in EGL wrapper
 2010-09-09 11:23:16 -07:00
Steve Howard
992c471ca9 Merge "Hidden API to control sorting of download manager queries." into gingerbread 2010-09-09 11:22:38 -07:00
Mathias Agopian
e7bca18f79 Merge "Fix a few typos in EGL wrapper" into gingerbread 2010-09-09 11:20:02 -07:00
Mathias Agopian
77fbf8ddd9 Fix a few typos in EGL wrapper 
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
 2010-09-09 11:12:54 -07:00
Jaikumar Ganesh
3302c9571c am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread 
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp

* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
  Fix to get A2DP to connect after unpairing
 2010-09-09 10:26:54 -07:00
Jaikumar Ganesh
839a78ea47 Merge "Fix to get A2DP to connect after unpairing" into gingerbread 2010-09-09 10:23:55 -07:00
Andreas Huber
f6aefe0c58 am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
 2010-09-09 10:15:33 -07:00
James Dong
ad8af53405 am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
  When 32-bit offset is used,
 2010-09-09 10:15:29 -07:00
Andreas Huber
3a264b5768 Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 2010-09-09 10:13:26 -07:00
James Dong
ed77ca44e1 Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 2010-09-09 10:13:08 -07:00
Gilles Debunne
a8f50177e0 am ab86b782: Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread 
Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp

* commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
  Fix for text selection in horizontally scrolled TextViews.
 2010-09-09 10:04:32 -07:00