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

36021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shimeng (Simon) Wang
365a1eab82 Merge "Use local variable instead of webview method." 2011-06-22 17:58:57 -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
Chet Haase
d18b805396 Merge "Fix flashing artifacts caused by invalidation bugs" 2011-06-22 17:17:02 -07:00
Romain Guy
4e72523f69 Merge "Fix another memory leak in OpenGLRenderer" 2011-06-22 17:12:14 -07:00
Jaikumar Ganesh
8641ce2204 Merge "Get the profile proxies after the BT Service is up." 2011-06-22 17:05:21 -07:00
Romain Guy
6618b64ea0 Merge changes I00b54796,Iac465b72 
* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.
 2011-06-22 16:14:58 -07:00
Romain Guy
24f1548d8a Merge "Collapse UI events in TextureView." 2011-06-22 15:01:59 -07:00
Brian Carlstrom
9fcb640455 Merge "Fix build." 2011-06-22 14:45:10 -07:00
Robert Greenwalt
54b5eae0ac Merge "resolved conflicts for merge of 7a652bc8 to master" 2011-06-22 14:41:09 -07:00
Dianne Hackborn
5297b1d11a Merge "Don't report a resize unless the window's surface actually changed." 2011-06-22 14:13:35 -07:00
Shailendra
ef71e3cb48 Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )" 2011-06-22 14:13:21 -07:00
Gloria Wang
8f207a9e12 Merge "Timed text display format support: 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata" 2011-06-22 13:47:45 -07:00
Romain Guy
3b965bfe26 Merge "Fix the issue where TextureView stuck if the producer side is too fast." 2011-06-22 13:42:34 -07:00
Brian Carlstrom
383fca63b7 Merge "JniUtil depends on webcore native library and should not depend on others to load it" 2011-06-22 13:42:07 -07:00
Robert Greenwalt
c0f7f2585f resolved conflicts for merge of 7a652bc8 to master 
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
 2011-06-22 13:20:14 -07:00
Adam Powell
0589681b57 Merge "Fix bug 4807086 - Options menu panel too narrow in landscape" 2011-06-22 12:58:03 -07:00
Mike Lockwood
b4a4a3de4c Merge changes I9851299e,I4160e73a 
* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
 2011-06-22 12:24:26 -07:00
Svetoslav Ganov
f066e54fea Merge "Minor tweak I forgot in the presious change." 2011-06-22 11:41:25 -07:00
Svetoslav Ganov
f6a12fe969 Merge "AccessibilityNodeInfo bounds inconsistent with compatibility mode." 2011-06-22 11:35:47 -07:00
Irfan Sheriff
1817d05803 am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-22 11:19:09 -07:00
James Dong
315efc241c Merge "Add some error log messages to indicate the failure of a recording session" 2011-06-22 11:07:52 -07:00
Irfan Sheriff
441e007a70 resolved conflicts for merge of 914ed90f to honeycomb-LTE 
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
 2011-06-22 11:01:16 -07:00
James Dong
5299258ce2 Merge "Switch to use MediaMetadataRetriever to generate the project thumbnail when the first media item is a MediaVideoItem" 2011-06-22 10:33:25 -07:00
Philip Milne
cb596e02c3 Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." 2011-06-22 10:18:32 -07:00
Irfan Sheriff
d6a5d9faaa am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-22 07:47:16 -07:00