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

22820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chet Haase
7d0c90d479 Merge "Double the performance of animations." 2010-10-11 10:08:00 -07:00
Chung-yih Wang
860d7db651 am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread 
Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'

* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
  Do not release the wifi lock if the screen is off.
 2010-10-11 10:03:27 -07:00
Scott Main
532d64b5c0 am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build 
Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3'

* commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
 2010-10-11 10:02:57 -07:00
Gilles Debunne
fbe1575189 resolved conflicts for merge of 42dd7ec9 to master 
Change-Id: Id388745d7ec22c48b34b744d5a4c07097cf2650b
 2010-10-11 09:57:05 -07:00
Mindy Pereira
7eb309d4f1 am 37c8ad77: (-s ours) am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread 
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'

* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
  DO NOT MERGE Limit the height of the pull glow.
 2010-10-11 09:44:16 -07:00
Scott Main
236906b31d am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc 
Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce'

* commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce':
  docs: a few style adjustments to admin doc
 2010-10-11 09:43:49 -07:00
Jean-Baptiste Queru
0ace3f4b92 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp 
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
 2010-10-11 09:38:10 -07:00
Jason Chen
5ce02e52b2 resolved conflicts for merge of '1d58e52a' into master 
Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f
 2010-10-11 09:24:33 -07:00
Jean-Baptiste Queru
56150037c7 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Mike Lockwood
eba77c6ece Merge "MTP: Fix copying files to root of storage using parent handle = 0" 2010-10-11 08:26:11 -07:00
Cary Clark
75d46de9d9 Merge "Check mNativeClass != null in public functions" 2010-10-11 06:49:01 -07:00
Hung-ying Tyan
1d83ed6b4e am 692cac9f: SipHelper: add debug log for challenge responses. 
Merge commit '692cac9fdd7b179ba807351772fdf2339c000dfe' into gingerbread-plus-aosp

* commit '692cac9fdd7b179ba807351772fdf2339c000dfe':
  SipHelper: add debug log for challenge responses.
 2010-10-10 23:38:04 -07:00
Andreas Huber
aeb7356d87 am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread 
Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'

* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
 2010-10-10 19:13:48 -07:00
Scott Main
3d3f98ea43 am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides 
Merge commit '7bfac24dcb5ec532b822507816929931e5e19002'

* commit '7bfac24dcb5ec532b822507816929931e5e19002':
  docs: new web apps dev guides
 2010-10-10 19:13:36 -07:00
Brad Fitzpatrick
4a11b6c8a8 am 4216c3c3: am a4682ed7: Merge "Minor SharedPreference clean-up." into gingerbread 
Merge commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635'

* commit '4216c3c3f75c6bd7ffa9a9279961f9ea6aa57635':
  Minor SharedPreference clean-up.
 2010-10-10 19:13:24 -07:00
Dianne Hackborn
09bd0c51e5 am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'

* commit '681f327e839a40a4d55d3567af341b9e90f62378':
  Fix retaining of granted permissions when updating of system app.
 2010-10-10 19:13:09 -07:00
Dianne Hackborn
a9d68d1d63 am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
 2010-10-10 19:11:51 -07:00