ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
22,726 Commits 2 Branches 0 Tags 54 MiB
807cb815ac
Commit Graph

22726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
807cb815ac am df08c2f0: am 692cac9f: SipHelper: add debug log for challenge responses. 
Merge commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de'

* commit 'df08c2f03e7cf7be7002d34efe8e4e8d24e406de':
  SipHelper: add debug log for challenge responses.
 2010-10-11 18:59:05 -07:00
Jean-Baptiste Queru
4e611bfe80 am 6d1321f0: am 65f23e71: Merge "Corrected visibility reporting error in WindowManager" 
Merge commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a'

* commit '6d1321f02f8e8c201469f17a7a62a4d063821b9a':
  Corrected visibility reporting error in WindowManager
 2010-10-11 18:58:35 -07:00
Jean-Baptiste Queru
18dff56d8b am c43189e7: am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep" 
Merge commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3'

* commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3':
  Hold partial wakelock during shutdown to avoid entering sleep
 2010-10-11 18:58:25 -07:00
Jean-Baptiste Queru
f2f37b626f am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing" 
Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f'

* commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f':
  Telephony: Fix radio state printing
 2010-10-11 18:57:54 -07:00
Jean-Baptiste Queru
9183b776db am d54a97a0: am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot" 
Merge commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c'

* commit 'd54a97a0efc5cdd8088a277b0e6787ea24711e0c':
  Fix time zone info in kernel is nothing after reboot
 2010-10-11 18:57:43 -07:00
Jean-Baptiste Queru
3729bed055 am 9dfa3037: am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 
Merge commit '9dfa30375e66ae533e253f5287a8c8e293187e19'

* commit '9dfa30375e66ae533e253f5287a8c8e293187e19':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
 2010-10-11 18:57:33 -07:00
Gilles Debunne
abc88a8aa5 am 1457bb0e: am 6b8bdaa9: New AppsPermission and market style 
Merge commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683'

* commit '1457bb0ef622b7ae8970fcb42d40a0c45713f683':
  New AppsPermission and market style
 2010-10-11 18:57:14 -07:00
Jeff Brown
a2bfe97d34 Merge "Fix an event injection bug when the policy is bypassed." 2010-10-11 18:15:38 -07:00
Romain Guy
fe1df66529 Merge "Don't draw fully transparent views/primitives." 2010-10-11 18:00:43 -07:00
Jeff Brown
33d54ce97d Fix an event injection bug when the policy is bypassed. 
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Cherry pick of b931a1b4 from gingerbread into master.

Change-Id: I700a5f07b8b227878cea9437a289a45a245c0424
 2010-10-11 17:54:12 -07:00
Jean-Baptiste Queru
32e58223c3 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp 
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.
 2010-10-11 17:49:42 -07:00
Jean-Baptiste Queru
199492337c am 779d1778: am bd1454f5: Merge "Include debugger connection status in error entry" 
Merge commit '779d1778b6147ee1b57428af234d1498a26f031e'

* commit '779d1778b6147ee1b57428af234d1498a26f031e':
  Include debugger connection status in error entry
 2010-10-11 17:49:28 -07:00
David Brown
cd3115b1aa am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone 
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
 2010-10-11 17:48:47 -07:00
Mike Lockwood
b2e0b981d1 am 1bdba9fa: am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread 
Merge commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61'

* commit '1bdba9fa3178d00a03dcbc3ede1818f7bff07e61':
  GPS: Fix another race condition in GPS HAL initialization
 2010-10-11 17:48:35 -07:00
Justin Ho
220ee10a8d am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 
Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf'

* commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf':
  Updated media playback controls, unlock screen, misc framework assets
 2010-10-11 17:48:24 -07:00
Vasu Nori
9f90cffa30 am a23964f9: am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread 
Merge commit 'a23964f9a1df7fb2f18e350fb4215933674f9991'

* commit 'a23964f9a1df7fb2f18e350fb4215933674f9991':
  bug:3082865 don't use IN to construct sql to delete downloads
 2010-10-11 17:43:34 -07:00
Brad Fitzpatrick
9a0618cc6e am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists. 
Merge commit 'ca1db5ae68971779fd8af83c908128849f470ae0'

* commit 'ca1db5ae68971779fd8af83c908128849f470ae0':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
 2010-10-11 17:43:06 -07:00
Xavier Ducrohet
f2d6b0f778 am ceb3aae3: am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread 
Merge commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'

* commit 'ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
  Avoid pre-processing images when they won't be used
 2010-10-11 17:42:54 -07:00
Jeff Brown
d129348647 am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread 
Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
 2010-10-11 17:42:30 -07:00
Stephen Hines
1cd70b912d Merge "Support for unsigned long and unsigned long long." 2010-10-11 17:32:25 -07:00
Romain Guy
1ad02eb3cb Merge changes I9a5e01bc,If1caee31 
* changes:
  Optimize GLSL shaders.
  Improve performance of linear gradients.
 2010-10-11 17:13:32 -07:00
Stephen Hines
24ae58d2be Merge "Test exported "long" type." 2010-10-11 15:14:36 -07:00
Alex Sakhartchouk
4b425895f1 Merge "Update allocation from bitmap. GL attribute cleanup in type." 2010-10-11 15:03:29 -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
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
Shimeng (Simon) Wang
4f5bdbe4a6 Merge "Avoid sending false orientation event to webkit." 2010-10-11 13:23:42 -07:00
Romain Guy
5fed6d1442 Merge "Redraw the screen when needed." 2010-10-11 12:44:28 -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
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
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
Jason Chen
5ce02e52b2 resolved conflicts for merge of '1d58e52a' into master 
Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f
 2010-10-11 09:24:33 -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