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

17188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Howard
c56eae725e Merge "New secure setting for mobile download size limit." into gingerbread 2010-08-02 16:49:22 -07:00
John Wang
e7a311ac06 am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread 
Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp

* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
 2010-08-02 15:33:47 -07:00
John Wang
156abdaf99 Merge changes Ic30e2801,I387bab4d into gingerbread 
* changes:
  Handle call list in CallManager "do not merge".
  Create CallManager class "do not merge"
 2010-08-02 15:31:37 -07:00
Christopher Tate
25a04d660b am a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread 
Merge commit 'a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp

* commit 'a213ce02ced6511edf02e29c45057f344bfe8636':
  Mute a common-case progress log about input injection
 2010-08-02 15:19:19 -07:00
Christopher Tate
47890f3257 Merge "Mute a common-case progress log about input injection" into gingerbread 2010-08-02 15:14:44 -07:00
Kenny Root
3880ae55fe am 739cdab7: Merge "Do not deference before null check" into gingerbread 
Merge commit '739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp

* commit '739cdab7cb63d53440bb411fa2d558e2114b4c81':
  Do not deference before null check
 2010-08-02 13:29:01 -07:00
Kenny Root
2a4e1249de Merge "Do not deference before null check" into gingerbread 2010-08-02 12:33:40 -07:00
Wink Saville
4a2218b098 am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:06:34 -07:00
Wink Saville
10375734e1 am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber. 
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
 2010-08-02 12:02:42 -07:00
Scott Main
3fcc418cff am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:29:49 -07:00
Scott Main
aa57958f88 am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo 
Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.
 2010-08-02 09:23:50 -07:00
Scott Main
1cf67def06 Merge "Doc change: Add nexus one to dev phones." into froyo 2010-08-02 09:16:30 -07:00
Brad Fitzpatrick
4a6d42004c am ee34a49f: Add missing word from docs. 
Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.
 2010-08-02 08:02:05 -07:00
Jeff Brown
b183fbd646 Enhanced VelocityTracker for > 5 pointers and fixed bugs. 
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.

Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data.  This could cause strange
behavior on secondary pointer up events.

Also added finished callback pooling in InputQueue.

Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
 2010-07-30 20:08:29 -07:00
Dianne Hackborn
e0991296b9 am 543f250d: Merge "Make the systemui process persistent." into gingerbread 
Merge commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp

* commit '543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
  Make the systemui process persistent.
 2010-07-30 19:12:50 -07:00
Dianne Hackborn
64a74f6537 Merge "Make the systemui process persistent." into gingerbread 2010-07-30 19:10:01 -07:00
Mathias Agopian
d7beac601a am 4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread 
Merge commit '4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp

* commit '4d7fc3651bd93d588d2b8580010414b59bc67729':
  remove copybit hack from software opengl (libagl)
 2010-07-30 18:03:17 -07:00
Mathias Agopian
3efd03a3c2 Merge "remove copybit hack from software opengl (libagl)" into gingerbread 2010-07-30 18:01:25 -07:00
Dirk Dougherty
86486c255f am 483b20e5: am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp

* commit '483b20e5ae65495d841de1844d97d79fbc0c1866':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:40:28 -07:00
Dirk Dougherty
6e6cc2014f am 2ff1ba01: Doc change: Cleanup for licensing doc. 
Merge commit '2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread

* commit '2ff1ba012c59169c9719cfab4516b9149414380b':
  Doc change: Cleanup for licensing doc.
 2010-07-30 17:37:39 -07:00
Kenny Root
d3326a9d8f am 8b61b68b: Merge "Only install after MCS success" into gingerbread 
Merge commit '8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp

* commit '8b61b68b648985df37197de204398f608c4ad8b1':
  Only install after MCS success
 2010-07-30 17:00:01 -07:00
Kenny Root
20f352905f Merge "Only install after MCS success" into gingerbread 2010-07-30 16:55:37 -07:00
Brad Fitzpatrick
ec38d3234f am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread 
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
 2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
36b022e7c2 Merge "StrictMode: time violations in Binder calls" into gingerbread 2010-07-30 15:20:28 -07:00
James Dong
78316abcec am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
 2010-07-30 14:52:05 -07:00
Jeff Brown
333e73fc91 am 00e5c613: Merge "Improve thread safety of input mappers." into gingerbread 
Merge commit '00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp

* commit '00e5c61366d3d3d62c259277823ea15a14f68ad4':
  Improve thread safety of input mappers.
 2010-07-30 14:49:43 -07:00
James Dong
6c9c4ea978 Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread 2010-07-30 14:49:23 -07:00
Jeff Brown
68e491d5da Merge "Improve thread safety of input mappers." into gingerbread 2010-07-30 14:48:25 -07:00
Jeff Brown
b51719b9ae Improve thread safety of input mappers. 
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.

Bug: 2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
 2010-07-30 14:43:58 -07:00
James Dong
e07e4c0a7b am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread 
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp

* commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
  Lower the lower bound for max file duration check
 2010-07-30 14:30:31 -07:00
James Dong
1ec47739f6 Merge "Lower the lower bound for max file duration check" into gingerbread 2010-07-30 14:28:26 -07:00
Xia Wang
8414dc0c48 am 131ce67d: Merge "DO NOT MERGE" into gingerbread 
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
 2010-07-30 13:46:24 -07:00
Xia Wang
7cfd5ebcc7 Merge "DO NOT MERGE" into gingerbread 2010-07-30 13:44:23 -07:00
Andreas Huber
66fe330690 am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 
Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp

* commit '432c5b6c1d4181194cb82a14107b6d10105231a9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-30 12:18:58 -07:00
Andreas Huber
f94c59413e am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo 
Merge commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread

* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-30 12:15:02 -07:00
Jean-Baptiste Queru
11472cedc7 am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread 
Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights
 2010-07-30 12:13:43 -07:00
Jean-Baptiste Queru
8fb1869d39 resolved conflicts for merge of 27eecb70 to gingerbread 
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
 2010-07-30 12:08:31 -07:00
Jean-Baptiste Queru
1000e383a9 am 0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts." 
Merge commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp

* commit '0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
  Fix a bug that prevented the creation of EGL shared contexts.
 2010-07-30 11:58:25 -07:00
Gilles Debunne
2b76145517 am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp

* commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 11:56:36 -07:00
Gilles Debunne
1d5cfae699 am 628be513: am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp

* commit '628be513e67ce6c61884b1baaf0379abfc56100b':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:56:24 -07:00
Gilles Debunne
c080e5e523 am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo 
Merge commit '3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread

* commit '3d8d9440d844816f065d2b10eb75bb693683cdad':
  Fixes regarding densities in "Providing Resources" documentation page.
 2010-07-30 11:53:21 -07:00
Gilles Debunne
55c65ca3f1 am 83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo 
Merge commit '83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread

* commit '83884db9dc0fbddb6ece566284259f6b941beb33':
  Fixed doc typos in HeterogeneousExpandableList.java.
 2010-07-30 11:53:16 -07:00
Jean-Baptiste Queru
3af76d8978 Merge "Fix a bug that prevented the creation of EGL shared contexts." 2010-07-30 11:42:09 -07:00
Steve Howard
c0d687db2b am 7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread 
Merge commit '7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp

* commit '7c600369c9695de73ca37db552eb81b8b89d5e76':
  Update Context.getSystemService() docs for download manager.
 2010-07-30 11:12:28 -07:00
Steve Howard
174ff06028 Merge "Update Context.getSystemService() docs for download manager." into gingerbread 2010-07-30 11:09:48 -07:00
Alex Yakavenka
cd3c0b9011 am a27353c1: Cat: Generalize stk into cat 
Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp

* commit 'a27353c1965911f69be8d02a01b15389189eab9d':
  Cat: Generalize stk into cat
 2010-07-30 11:05:26 -07:00
Jean-Baptiste Queru
4d51704482 am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder" 
Merge commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp

* commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
  Cat: Move Stk imlpementation into Cat folder
 2010-07-30 10:55:02 -07:00
Jean-Baptiste Queru
598f9cec04 am d8d03c89: Merge "Ccat: Initial CCAT implementation" 
Merge commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp

* commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf':
  Ccat: Initial CCAT implementation
 2010-07-30 10:54:59 -07:00
Jean-Baptiste Queru
9741fdbd05 Merge "Cat: Move Stk imlpementation into Cat folder" 2010-07-30 10:44:00 -07:00
Jean-Baptiste Queru
23667b8dc3 Merge "Ccat: Initial CCAT implementation" 2010-07-30 10:42:15 -07:00