ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
26,319 Commits 2 Branches 0 Tags 54 MiB
f85c337dad
Commit Graph

26319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Morrill
f85c337dad Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp 2011-01-13 12:21:07 -08:00
Jason parks
70a7cec0c4 am a3cdaa53: Revert "Remove the APIs for the old encryption scheme." 
* commit 'a3cdaa5337fa573c4c61770195d6232c2e587090':
  Revert "Remove the APIs for the old encryption scheme."
 2011-01-13 12:18:40 -08:00
Jason parks
e36c415874 Revert "Remove the APIs for the old encryption scheme." 
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
 2011-01-13 14:15:43 -06:00
Romain Guy
301276c898 am c15c7a79: Merge "Cleanup implementation of hardware layers." into honeycomb 
* commit 'c15c7a79a69733bd21d6548fd74c2874fdabe7e8':
  Cleanup implementation of hardware layers.
 2011-01-13 12:15:35 -08:00
Jamie Gennis
9a1754adcd am 5865c494: Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb 
* commit '5865c494a571a7e164218857d3b860004c50baf6':
  Fix a bug in SurfaceTexture::dequeueBuffer.
 2011-01-13 12:15:31 -08:00
Romain Guy
bd0ec24441 Merge "Cleanup implementation of hardware layers." into honeycomb 2011-01-13 12:13:59 -08:00
Jamie Gennis
0579d57502 Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb 2011-01-13 12:13:56 -08:00
Eric Laurent
0f033103f0 am 8eff4524: Merge "Fix issue 3302649." into honeycomb 
* commit '8eff45242180c7dec2b437c3929cb7ea3345f60c':
  Fix issue 3302649.
 2011-01-13 12:02:35 -08:00
Eric Laurent
a7196d2e83 Merge "Fix issue 3302649." into honeycomb 2011-01-13 11:59:13 -08:00
Dan Morrill
b34b504aff Fix merge conflict for 'c506ab89' 
Conflicts:
	NOTICE

Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
 2011-01-13 11:48:42 -08:00
Jamie Gennis
bb8721602e am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb 
* commit '9aba2324ac8d7216732b42346bfcaf0be71eb22e':
  Add getTransformMatrix to the SurfaceTexture API.
 2011-01-13 11:31:03 -08:00
Jamie Gennis
e00b12aeeb Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb 2011-01-13 11:29:14 -08:00
Eric Fischer
745781fc03 am 39d80c38: Merge "Import revised translations." into honeycomb 
* commit '39d80c3846972e6204dfd956263a3fb6a799444d':
  Import revised translations.
 2011-01-13 11:03:47 -08:00
Eric Fischer
75dc53f237 Merge "Import revised translations." into honeycomb 2011-01-13 10:59:52 -08:00
Xavier Ducrohet
979b635068 am 310a4d81: LAyoutLib: Fix build by adding missing IWindowSession implementation. 
* commit '310a4d815b693e358d151b9aa2823c5022993f9b':
  LAyoutLib: Fix build by adding missing IWindowSession implementation.
 2011-01-13 10:46:59 -08:00
Xavier Ducrohet
1c1ccdfc21 am 1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb 
* commit '1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
  LayoutLib: move MockView back into its original package.
 2011-01-13 10:28:05 -08:00
Xavier Ducrohet
36c284dfb1 am 66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb 
* commit '66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa':
  LayoutLib: Add getViewParent/getViewIndex on RenderSession.
 2011-01-13 10:28:02 -08:00
Nick Pelly
562cae3549 am 18adceb4: am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit '18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
  New Intent defined for RF ON/OFF events
 2011-01-13 10:26:28 -08:00
Brad Fitzpatrick
a3faee6937 am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper." 
* commit '54f428a63f33f4722c09b7688e6ca7960394f81f':
  Fix for crash when setting live wallpaper.
 2011-01-13 10:26:19 -08:00
Kenny Root
c6c67736c2 am 47075079: (-s ours) am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 
* commit '470750793b6e930a323ee63cbed05c43dc435ba1':
  Add the {get,set}PackageObbPaths calls to API
 2011-01-13 10:26:13 -08:00
James Dong
b13f8d5a49 am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb 
* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
  Add audio encoding parameters check
 2011-01-13 10:24:44 -08:00
Svetoslav Ganov
ad4b2fd042 am 06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb 
* commit '06e32b434b62b22eeee900851ff56f2098ddc019':
  Updating the WebView accessibility key bindings after discussion with the access-eng team
 2011-01-13 10:24:38 -08:00
Xavier Ducrohet
c299ae8dbb Merge "LayoutLib: move MockView back into its original package." into honeycomb 2011-01-13 10:22:53 -08:00
Xavier Ducrohet
7550a0c576 Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb 2011-01-13 10:22:43 -08:00
James Dong
0e1e796ae6 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Jaikumar Ganesh
b98cf7051f am b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb 
* commit 'b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
  Phone crash when old callback func is woken up when enabling BT.
 2011-01-13 10:21:15 -08:00
Alex Sakhartchouk
62a4b9fee2 am d88ad4ab: Merge "Documentation" into honeycomb 
* commit 'd88ad4ab49280a19da6582ba6e776c296be79ec0':
  Documentation
 2011-01-13 10:20:28 -08:00
Robert Greenwalt
63576855ac am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb 
* commit '495056ab6709bbf77879a4b556aa1d17446bfe48':
  Turn off DUN connection after tethering.
 2011-01-13 10:19:39 -08:00
Gilles Debunne
41df0d0cc4 am b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb 
* commit 'b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
  QuickContactBadge shows its pressed state
 2011-01-13 10:19:30 -08:00
Dan Morrill
90ed94cf71 am 4330b146: Adding ASL2 attribution for VisualOn. 
* commit '4330b1464d26fa693b61d496092e10ce0419ee3d':
  Adding ASL2 attribution for VisualOn.
 2011-01-13 10:19:29 -08:00
Svetoslav Ganov
037c884f86 Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb 2011-01-13 10:17:02 -08:00
Jaikumar Ganesh
273537b56a Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb 2011-01-13 10:14:40 -08:00
Alex Sakhartchouk
c927792bed Merge "Documentation" into honeycomb 2011-01-13 10:14:14 -08:00
Robert Greenwalt
774502bc13 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Gilles Debunne
b278f1e541 Merge "QuickContactBadge shows its pressed state" into honeycomb 2011-01-13 09:50:40 -08:00
Dan Morrill
960f8a68a7 Adding ASL2 attribution for VisualOn. 
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
 2011-01-13 09:24:30 -08:00
Jason parks
7180ea8aec am 21f62b9e: Merge "Add a method enable encryption." into honeycomb 
* commit '21f62b9e461416ae61c8471f7199f104f8fe33de':
  Add a method enable encryption.
 2011-01-13 07:44:55 -08:00
Jason parks
2b851f3dc0 am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb 
* commit 'ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
  Remove the APIs for the old encryption scheme.
 2011-01-13 07:42:55 -08:00
Jason parks
5bf379e5b6 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
0d99621dcf Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Marco Nelissen
fb454c76a1 am f679ba7d: Cherrypick from GB. Do Not Merge. 
* commit 'f679ba7d944a403fbdc77926c44978ffd5161f2d':
  Cherrypick from GB. Do Not Merge.
 2011-01-13 07:31:53 -08:00
Ben Murdoch
afb77eca7b am 6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb 
* commit '6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
  Improve error handling (NPE in DRT2)
 2011-01-13 06:47:45 -08:00
Ben Murdoch
07c8c0244e Merge "Improve error handling (NPE in DRT2)" into honeycomb 2011-01-13 06:46:17 -08:00
Wink Saville
e45060548f am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 
* commit '5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
  Initialize mOtaspMode to OTASP_UNKNOWN.
 2011-01-13 06:26:23 -08:00
Wink Saville
67c43240ae Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Shih-wei Liao
69014d73ab am 96100195: Fix the build. 
* commit '96100195f06d9be287f2577a41f498917b34f7ef':
  Fix the build.
 2011-01-13 02:23:21 -08:00
Shih-wei Liao
bb6e33b49a am 078717be: Merge "Disable on-device linking" into honeycomb 
* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
  Disable on-device linking
 2011-01-13 02:07:53 -08:00
Shih-wei Liao
632db906ca am c758f1c6: Merge "Fix the build." into honeycomb 
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
  Fix the build.
 2011-01-13 02:07:48 -08:00
Shih-wei Liao
dfd144493d am f6dd9c53: Merge "On-device linking." into honeycomb 
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.
 2011-01-13 02:07:39 -08:00
Shih-wei Liao
00d5ddb396 Merge "Disable on-device linking" into honeycomb 2011-01-13 02:06:17 -08:00