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

17530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
38c371361b am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 
Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp

* commit '28333315c6f62b303de2ec0ac9e48158ed419f06':
  Added support for the GL_TEXTURE_EXTERNAL target
 2010-06-21 15:14:29 -07:00
Mathias Agopian
8207575c21 am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread 
Merge commit '7e73a2ce17740abd028d9944c423e191e5b4854c' into gingerbread-plus-aosp

* commit '7e73a2ce17740abd028d9944c423e191e5b4854c':
  Improve SensorManager documentation
 2010-06-21 15:12:14 -07:00
Mathias Agopian
b16fa651dd Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread 2010-06-21 15:11:18 -07:00
Mathias Agopian
06a7cd44e1 Merge "Improve SensorManager documentation" into gingerbread 2010-06-21 15:10:13 -07:00
Jean-Baptiste Queru
98815ecfdf Merge "Recover a handful of commits that were reverted earlier" 2010-06-21 14:29:47 -07:00
Robert Greenwalt
a29e9300ad Merge "Reorder ThrottleService startup to avoid race." 2010-06-21 14:12:38 -07:00
Jeff Brown
a7a0b1ec5c am 7fbdc84e: More native input event dispatching. 
Merge commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a' into gingerbread-plus-aosp

* commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a':
  More native input event dispatching.
 2010-06-21 14:06:31 -07:00
Jeff Brown
51d45a710e More native input event dispatching. 
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.

Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
 2010-06-21 13:59:34 -07:00
Jean-Baptiste Queru
ff5f34f3c9 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
Vasu Nori
b2e002a8d5 Merge "fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f" 2010-06-21 13:18:00 -07:00
Brad Fitzpatrick
702ea9d42f Start of work on passing around StrictMode policy over Binder calls. 
This is (intendend to be) a no-op change.

At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name.  But nothing is actually
done with them yet.  That value should right now always be 0.

This now boots and seems to work.

Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
 2010-06-21 12:56:35 -07:00
Jean-Baptiste Queru
645c8560ce Undo previous merge 
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
 2010-06-21 12:37:08 -07:00
Evan Millar
1b14497710 am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'

* commit '9afeda0519c4f4892611565d678f01d269863bb8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:12:55 -07:00
Evan Millar
c7e9defdd3 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:10:55 -07:00
Evan Millar
a2f89660b4 Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 2010-06-21 12:09:40 -07:00
Jean-Baptiste Queru
9b0db86c2e resolved conflicts for merge of 6c9a3004 to master 
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
 2010-06-21 11:44:49 -07:00
Kenny Root
9a5366d778 am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations 
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
 2010-06-21 11:37:10 -07:00
Andrew Stadler
9e02ba78dc Merge "Add getWrappedCursor, and update the JavaDoc." 2010-06-21 11:35:51 -07:00
The Android Open Source Project
ecfae4c86a merge from froyo-plus-aosp 
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
 2010-06-21 11:23:45 -07:00
Kenny Root
c74dafe038 am f25c560d: am 30cf330f: Import revised translations 
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
 2010-06-21 11:20:28 -07:00
Kenny Root
5adc399c76 am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:17:07 -07:00
Kenny Root
f50f465b02 am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:16:25 -07:00
Vasu Nori
63f6dee628 Merge "journal_mode should be set only on non-memory databases" 2010-06-21 10:46:29 -07:00
Kenny Root
102961979e am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
 2010-06-21 10:16:48 -07:00
Chia-chi Yeh
2cf5e79922 am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 10:16:45 -07:00
Shimeng (Simon) Wang
fbb7afa1a1 Merge "Add dumpChildFramesAsText function support in LayoutTestController." 2010-06-21 10:07:35 -07:00
Brad Fitzpatrick
83f737ab6d am 65ff03a1: am 04b243d0: Fix NPE during ANRs. 
Merge commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0'

* commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0':
  Fix NPE during ANRs.
 2010-06-21 09:54:24 -07:00
Kenny Root
9c4ff3a239 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:15:29 -07:00
Kenny Root
1f8017dc51 am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
 2010-06-21 09:08:51 -07:00
Chia-chi Yeh
01d556026d am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33' into gingerbread-plus-aosp

* commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 09:08:16 -07:00
Brad Fitzpatrick
e27b2cf3e8 am 04b243d0: Fix NPE during ANRs. 
Merge commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c' into gingerbread-plus-aosp

* commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c':
  Fix NPE during ANRs.
 2010-06-21 09:05:16 -07:00
Kenny Root
46d6c07da7 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:02:13 -07:00
Chia-chi Yeh
8e0ebcac64 am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread

* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 08:54:19 -07:00
Chia-chi Yeh
7c15e9b850 Revert "Don't chdir into the keystore directory" 
The same functionality can be achieved by running "stop keystore".
This reverts commit 831c6cc7c1cfcf1271c75dc960948ab6ce720b67.
 2010-06-19 04:44:22 +08:00
The Android Open Source Project
5292755e6e merge from open-source master 
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
 2010-06-18 12:46:16 -07:00
The Android Open Source Project
16df15b777 merge from open-source master 
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
 2010-06-18 12:44:20 -07:00
The Android Open Source Project
de3f19a220 merge from open-source master 
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
 2010-06-18 12:40:42 -07:00
The Android Open Source Project
2045f4b3c5 merge from open-source master 
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
 2010-06-18 11:36:35 -07:00
Colin Cross
dc3efcaddd Don't chdir into the keystore directory 
If the keystore daemon chdir's into /data/misc/keystore, /data can
never be unmounted.  During bringup, it's helpful if we can umount
/data and reformat it.

Change-Id: Id5b93ee8a54846fd07e6e0e57bfd0a6fabf603ee
 2010-06-17 22:50:10 -07:00
Daniel Sandler
6ca1230036 am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread 
Merge commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a'

* commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a':
  Fix SDK docs build.
 2010-06-17 19:18:31 -07:00
Daniel Sandler
df8fd1c710 am a2650db7: Merge "Fix SDK docs build." into gingerbread 
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp

* commit 'a2650db770e93a9424d6d6948fd31f943f6dac49':
  Fix SDK docs build.
 2010-06-17 19:16:28 -07:00
Daniel Sandler
f9b7c243a4 Merge "Fix SDK docs build." into gingerbread 2010-06-17 19:14:44 -07:00
Dianne Hackborn
1800919f38 am 3f704e98: am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '3f704e983e36c668a3a13690655ab809666dfc3e'

* commit '3f704e983e36c668a3a13690655ab809666dfc3e':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:55:24 -07:00
Scott Main
8085df9c68 am 0b16e6a0: am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'

* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:55:19 -07:00
James Dong
830e276e6e am eaeec4b7: am 2bc48186: am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'

* commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 18:55:13 -07:00
Dianne Hackborn
3240206996 am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp

* commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:47:28 -07:00
Scott Main
cf02972d7c am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp

* commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:47:25 -07:00
James Dong
50af7a9bb1 am 2bc48186: am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 
Merge commit '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp

* commit '2bc481861ab374f87c12b7bb816ff75ac46147f1':
  When filling the cache, we always time out waiting for a condition that won't occur.
 2010-06-17 18:47:22 -07:00
Dianne Hackborn
089ae94ae4 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test 
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
 2010-06-17 18:43:31 -07:00
Scott Main
337062fd3f am 5f11e95f: docs: small edits to catchup to edits made in html pushed live 
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
 2010-06-17 18:43:13 -07:00