ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,887 Commits 2 Branches 0 Tags 54 MiB
90241a102e
Commit Graph

22887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
6bdd529440 am 15f7ff3c: Merge "Fix compile errors in telephony tests" 
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp

* commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
  Fix compile errors in telephony tests
 2010-10-11 15:32:12 -07:00
Joe Onorato
0864f77aa3 am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
 2010-10-11 15:22:30 -07:00
Joe Onorato
eaa166e233 Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 2010-10-11 15:19:47 -07:00
Scott Main
d71f246ca4 am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge. 
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp

* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
  Revert "docs: new web apps dev guides" Do not merge.
 2010-10-11 15:15:09 -07:00
Stephen Hines
24ae58d2be Merge "Test exported "long" type." 2010-10-11 15:14:36 -07:00
Jean-Baptiste Queru
956ae0d90e Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Scott Main
a2e686914d am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge. 
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread

* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
  Revert "docs: new web apps dev guides" Do not merge.
 2010-10-11 15:04:20 -07:00
Alex Sakhartchouk
4b425895f1 Merge "Update allocation from bitmap. GL attribute cleanup in type." 2010-10-11 15:03:29 -07:00
Chris Tate
ae275c583d am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread 
Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp

* commit '0a7892367f46e3653e9857195ec19356f848b7f8':
  Temporarily turn on backup/restore debug logs
 2010-10-11 14:45:22 -07:00
Chris Tate
966ae9392d Merge "Temporarily turn on backup/restore debug logs" into gingerbread 2010-10-11 14:42:00 -07:00
Mathias Agopian
c6f607dcdd am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp

* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
  fix a bug where FLIP_H would do a 180 rotation
 2010-10-11 14:40:02 -07:00
Mathias Agopian
20f29b4a2a Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 2010-10-11 14:37:57 -07:00
Mike Lockwood
ff19a1fc93 Merge "MTP: Include size of 12 byte header in packet size for GetObject data packet" 2010-10-11 14:37:06 -07:00
Mathias Agopian
3c2c54c270 fix a bug where FLIP_H would do a 180 rotation 
Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
 2010-10-11 14:19:24 -07:00
Mathias Agopian
2e109a8666 am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread 
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp

* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
  deliver invalidate messages AFTER other messages
 2010-10-11 14:17:25 -07:00
Mathias Agopian
eea35e1e86 Merge "deliver invalidate messages AFTER other messages" into gingerbread 2010-10-11 14:15:04 -07:00
Mathias Agopian
7b0ba16688 deliver invalidate messages AFTER other messages 
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.

Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
 2010-10-11 14:11:15 -07:00
Stephen Hines
3817849c7e Merge "Fix support for 64-bit integers." 2010-10-11 14:02:08 -07:00
Shimeng (Simon) Wang
16596e6609 Merge "Initialized the orientation variable to -1." 2010-10-11 13:56:15 -07:00
Joe Onorato
167af513b1 am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread 
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.
 2010-10-11 13:55:15 -07:00
Joe Onorato
09ed308945 Merge "Don't throw when userActivity fails because of the permission check." into gingerbread 2010-10-11 13:52:34 -07:00
Brad Fitzpatrick
49dae8a7e7 am 6bb7a4a6: Go one day into 1970 for timezone code. 
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp

* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
  Go one day into 1970 for timezone code.
 2010-10-11 13:49:12 -07:00
Shimeng (Simon) Wang
4f5bdbe4a6 Merge "Avoid sending false orientation event to webkit." 2010-10-11 13:23:42 -07:00
Brad Fitzpatrick
f115ddb3ec am ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread 
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp

* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
  On boot, advance time to at least 1970.
 2010-10-11 13:03:15 -07:00
Brad Fitzpatrick
aefa57869c Merge "On boot, advance time to at least 1970." into gingerbread 2010-10-11 13:00:51 -07:00
Romain Guy
5fed6d1442 Merge "Redraw the screen when needed." 2010-10-11 12:44:28 -07:00
Mathias Agopian
8d5ed61121 am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread 
Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp

* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
  fix a bug where timeouts would only be handled when a message was delivered
 2010-10-11 12:44:23 -07:00
Mathias Agopian
7f5b5a8ebf Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread 2010-10-11 12:41:33 -07:00
Mathias Agopian
23a0920339 fix a bug where timeouts would only be handled when a message was delivered 
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
 2010-10-11 12:40:09 -07:00
Andreas Huber
bb79813887 am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread 
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp

* commit '1010da2e02216b2f94fbe763a82d53201b340217':
  Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
 2010-10-11 12:37:50 -07:00
Andreas Huber
5b25eff784 Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread 2010-10-11 12:36:03 -07:00
Gilles Debunne
1e3b364b73 resolved conflicts for merge of 2da9338c to master 
Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2
 2010-10-11 12:23:55 -07:00
Gil Dobjanschi
52d37ef574 Merge "Color effect comments and method name changes." 2010-10-11 12:11:25 -07:00
Mike Lockwood
fdc24c8dc3 am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread 
Merge commit '86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp

* commit '86564dc673db6dd752c326e53404677a3db43bec':
  GPS: Add update_network_state call to AGpsRillInterface
 2010-10-11 12:05:20 -07:00
Brad Fitzpatrick
370ff0effb am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread 
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp

* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
  StrictMode: check max-offenses-per-loop earlier, before allocations
 2010-10-11 12:05:14 -07:00
Mike Lockwood
c9df3e82d1 Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread 2010-10-11 11:56:47 -07:00
Brad Fitzpatrick
7669f03f89 Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread 2010-10-11 11:56:40 -07:00
Mike Lockwood
e2b422efea am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread 
Merge commit '2d39374f081031871a15c4532242afe9a8738f9f'

* commit '2d39374f081031871a15c4532242afe9a8738f9f':
  GPS: More HAL initialization cleanup
 2010-10-11 11:36:01 -07:00
Amith Yamasani
63ebdb5a0e Merge "2763342 Toasts do not fire accessibility events" 2010-10-11 11:34:27 -07:00
Amith Yamasani
8bff4c4f27 Merge "2853037 AccessibilityEvent should describe Tab controls" 2010-10-11 11:29:29 -07:00
Adam Powell
4139f9b1ba Merge "Updated styles and metrics." 2010-10-11 11:26:57 -07:00
Wink Saville
8f10811ada am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread 
Merge commit '83d97f460412f117998f4d446fd65ca79761a294'

* commit '83d97f460412f117998f4d446fd65ca79761a294':
  Add some error-case logging.
 2010-10-11 10:49:47 -07:00
Irfan Sheriff
863052f25b am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread 
Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9'

* commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9':
  fix getmacaddress race condition (don't auto-merge)
 2010-10-11 10:49:39 -07:00
Mindy Pereira
4885054b6d am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available. 
Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a'

* commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a':
  DO NOT MERGE Set the cap at alpha to 80% of the total available.
 2010-10-11 10:49:27 -07:00
Brad Fitzpatrick
655ce403cd resolved conflicts for merge of b3ffd4ad to master 
Change-Id: I80b227b678ef168a45494acf879debed5861de39
 2010-10-11 10:46:01 -07:00
John Wang
91fb608db1 am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread 
Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6'

* commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6':
  Fix startDtmf.
 2010-10-11 10:42:37 -07:00
Gilles Debunne
17c73b378c resolved conflicts for merge of 2da9338c to master 
Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af
 2010-10-11 10:37:51 -07:00
Xia Wang
e99855c76a am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread 
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp

* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
  Add mock ril control commands and tests
 2010-10-11 10:32:04 -07:00
Xia Wang
e3e077d738 Merge "Add mock ril control commands and tests" into gingerbread 2010-10-11 10:28:20 -07:00
Mike Lockwood
eac429b16a am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread 
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'

* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
  GPS: Do not call sGpsInterface->init() multiple times
 2010-10-11 10:20:41 -07:00