ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
36,065 Commits 2 Branches 0 Tags 54 MiB
86a1082c82
Commit Graph

36065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
86a1082c82 am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-23 14:30:25 -07:00
Jerry J. Wang
8dd06428c2 am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 
* commit '4333de2a8e878b319c0e779942b87c042804d352':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
 2011-06-23 14:29:55 -07:00
Scott Main
6e0c226e70 am d65fab3d: am e2f74aec: am 929cba13: docs: remove exclamation from media title 
* commit 'd65fab3de6381a8b040101c74d5276290de1c7c1':
  docs: remove exclamation from media title
 2011-06-23 14:29:50 -07:00
Katie McCormick
7f45450d9c am 02362299: am a108223f: am d4fac2c0: Doc change: updated TOC for Bluetooth CL. 
* commit '023622997d886074f7c0cf831945a466803acf5e':
  Doc change: updated TOC for Bluetooth CL.
 2011-06-23 14:29:25 -07:00
David Brown
e020f65966 Merge "Update CallerInfo to use the geocoder in the updated location." 2011-06-23 14:08:56 -07:00
Jamie Gennis
b056ca5ede Merge "Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is in sync mode." 2011-06-23 13:02:40 -07:00
Dianne Hackborn
5e382d6608 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Adam Powell
c0d37e339a Merge "Fix bug 4904520 - Swap force close/report buttons" 2011-06-23 12:05:50 -07:00
Philip Milne
c55ad51832 Merge "Handle baseline aligned rows in which some components define baseline and some don't." 2011-06-23 12:05:09 -07:00
Adam Powell
80adaa3b4c Merge "Fix bug 4595971 - Menu not prepared to be prepared" 2011-06-23 11:38:10 -07:00
Brian Carlstrom
6eb0e6526c Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)" 2011-06-23 10:26:38 -07:00
Andreas Huber
a82a35971d Merge "Parse RTP-Info even for live streams." 2011-06-23 10:12:22 -07:00
Andreas Huber
24dd23a2f6 Merge "Reconstruct sync frame indication for content served by the MPEG2TSExtractor" 2011-06-23 10:12:12 -07:00
Gloria Wang
d894b17fa9 Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle." 2011-06-23 09:33:11 -07:00
Glenn Kasten
5b45ade05d Merge "Fix warnings for uninitialized local variables" 2011-06-23 09:00:03 -07:00
Scott Main
04677ff293 am dba7dd71: am 6f2bcc4d: am 24ef1aa6: Merge "docs: use new CSE to show results for all sites" into honeycomb-mr2 
* commit 'dba7dd71f296a6220cb5a5308221b9ead1b4f106':
  docs: use new CSE to show results for all sites
 2011-06-23 08:17:28 -07:00
Robert Ly
b9b94a8a1a am b6f9e5dd: am 60506b4f: am d60e1b5b: cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5 
* commit 'b6f9e5dd96e34691743000d9f51e4d5d71ead70a':
  cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5
 2011-06-23 08:17:23 -07:00
Irfan Sheriff
4cdeee9a8f am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
  Release wakelock after use
 2011-06-23 08:17:01 -07:00
Bruno Oliveira
9d8489f565 am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-23 08:16:55 -07:00
Irfan Sheriff
e40bb6b7e3 am a08c5520: (-s ours) am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit 'a08c55208335a2dfd6642793d6b3cc2e86615282':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-23 08:16:49 -07:00
Irfan Sheriff
6717a36a94 am 5389c80d: (-s ours) am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit '5389c80d1f7c9d2710a47ccf70cce94c2d5d9599':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-23 08:16:44 -07:00
Eric Laurent
5a4bec1711 Merge "Added audio_bytes_per_sample() helper function" 2011-06-23 08:08:20 -07:00
Irfan Sheriff
c286e0e665 am 20b6ded6: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '20b6ded6e326e3fedb9f7e112773a82b94c4aca6':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-23 07:50:01 -07:00
Wink Saville
82381b7833 am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 
* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
  Use dataConnectionNotInUse to decide if a DC is free.
 2011-06-23 07:49:30 -07:00
Wink Saville
a18d85d506 am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 
* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
  Fix handling of unsol_data_state_change with PDP sharing scenario
 2011-06-23 07:49:16 -07:00
Wink Saville
7a6380f33b am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 
* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
 2011-06-23 07:49:09 -07:00
Wink Saville
808c62c352 am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 
* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
  Special retry back-off timer in call setup failure.
 2011-06-23 07:49:02 -07:00
Irfan Sheriff
c916527884 am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit 'e8898d4a4441b590c3c6e6336cfbb53fcd853775':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-23 07:48:38 -07:00
Jaikumar Ganesh
884cfaa048 am f50ef6a4: (-s ours) am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'f50ef6a43d721e933fd596113f8ae6644b29f3f5':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-23 07:48:31 -07:00
Bruno Oliveira
923f0fa599 am a62f707d: am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'a62f707da28226d5c6d160d1f0e21a65dcfba5fc':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-23 07:47:39 -07:00
Scott Main
dffce20729 am 69ff6a47: am a6632992: am 04295266: add api level 13 flag for docs 
* commit '69ff6a47c6e302f1b8aaeccffea3434f1edc4ee6':
  add api level 13 flag for docs
 2011-06-23 07:47:31 -07:00
Daniel Sandler
de20702264 am e89d4b5d: am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit 'e89d4b5d6952031c31f15db95435e7541e5df08c':
  Fix crazy notification panel background.
 2011-06-23 07:41:37 -07:00
Scott Main
995d840b2f am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos 
* commit 'fe8e2fb32febccc5c88ca4eba089d747755975d4':
  docs: fix a couple typos
 2011-06-23 07:41:29 -07:00
Scott Main
23e9c503b0 am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link 
* commit '35837c3234a2e888d0a1016f71c5b371a7014f4e':
  docs: fix broken link
 2011-06-23 07:41:15 -07:00
Robert Greenwalt
97a7fd021d am e813ea5a: am 4906376f: Just a random fix. 
* commit 'e813ea5a11db8070d2ca72cab416fa1a8fd3539c':
  Just a random fix.
 2011-06-23 07:40:49 -07:00
Hung-ying Tyan
30877f68f7 Merge "Keep the keepalive process going after NAT port is changed." 2011-06-23 04:29:45 -07:00
Brian Carlstrom
ce4b51d3bd Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore) 
Bug: 4599735

Change-Id: Iee38a2e2929c45b6405214c9012819da09b273af
 2011-06-23 02:10:23 -07:00
Jeff Sharkey
50f31b8381 Merge "Enable bandwidth module from stats service." 2011-06-22 22:21:31 -07:00
Adam Powell
9b27dcaccb Merge "Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable" 2011-06-22 21:38:48 -07:00
Hung-ying Tyan
5dcf2b7808 Merge "Move the keepalive process to SipSessionImpl and make it reusable." 2011-06-22 21:38:27 -07:00
Adam Powell
35b1b9a964 Merge "Tweak action bar metrics." 2011-06-22 21:14:42 -07:00
Romain Guy
70059495d6 Merge "Prevent possible NPE in TextureView" 2011-06-22 21:02:31 -07:00
Romain Guy
d2091e8e24 Merge "Add the ability to specify the opacity of a TextureView" 2011-06-22 20:59:46 -07:00
Nick Pelly
3cdcbce91e resolved conflicts for merge of 6ce70394 to master 
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
 2011-06-22 20:32:36 -07:00
Xia Wang
80bb58ae03 Merge "Fix issues in Opengl Benchmark tests: - fix live wallpaper drawing, bind the global vertex program after it - scale the icons according to render surface in display icons, also add a background for the icon display test case." 2011-06-22 19:34:34 -07:00
Jim Miller
b8989608c4 Merge "Update LockScreen layouts to latest UX spec." 2011-06-22 18:10:02 -07:00
Raphael Moll
dfcbba0404 am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 18:05:22 -07:00
Shimeng (Simon) Wang
365a1eab82 Merge "Use local variable instead of webview method." 2011-06-22 17:58:57 -07:00
Raphael Moll
68238ef270 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Conley Owens
05cb2eed18 am 587e9563: am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit '587e9563d61beaaa67090eddd99b737847561eb9':
  Check if we are in daylight time when calculating timezone
 2011-06-22 17:37:19 -07:00