drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,771 Commits 1 Branch 0 Tags
Commit Graph

39771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei-Ta Chen
2e206ff8b9 am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread 
* commit '62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
  Do not merge.
 2011-01-13 12:38:38 -08:00
Gloria Wang
c35b326891 am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution" 
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
  Initial OMA DRM forward lock contribution
 2011-01-13 12:38:29 -08:00
Dan Morrill
85ffbe6b02 Merge "Fix merge conflict for 'c506ab89'" into honeycomb-plus-aosp 2011-01-13 12:21:07 -08:00
Jason parks
4a534fa899 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
a3cdaa5337 Revert "Remove the APIs for the old encryption scheme." 
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
 2011-01-13 14:15:43 -06:00
Romain Guy
718153c717 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
c3693a10d4 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
c15c7a79a6 Merge "Cleanup implementation of hardware layers." into honeycomb 2011-01-13 12:13:59 -08:00
Jamie Gennis
5865c494a5 Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb 2011-01-13 12:13:56 -08:00
Romain Guy
ada830f639 Cleanup implementation of hardware layers. 
The new implementation relies on OpenGLRenderer's existing layer
code instead of duplicating it. The new code is much cleaner, with
simpler and better APIs and allows tracking of drawn regions inside
layers. Region tracking is not yet enabled but this will be done
in a future CL.

Change-Id: Ie826121a2227de8252c77b992a61218defea5143
 2011-01-13 12:13:20 -08:00
Wei-Ta Chen
62cd5c9788 am 61d9ffbf: Merge "Do not merge." into gingerbread 
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.
 2011-01-13 12:06:38 -08:00
Eric Laurent
345fb5313b am 8eff4524: Merge "Fix issue 3302649." into honeycomb 
* commit '8eff45242180c7dec2b437c3929cb7ea3345f60c':
  Fix issue 3302649.
 2011-01-13 12:02:35 -08:00
Wei-Ta Chen
61d9ffbfd8 Merge "Do not merge." into gingerbread 2011-01-13 12:02:32 -08:00
Eric Laurent
8eff452421 Merge "Fix issue 3302649." into honeycomb 2011-01-13 11:59:13 -08:00
Dan Morrill
8cc7c34c1b Fix merge conflict for 'c506ab89' 
Conflicts:
	NOTICE

Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
 2011-01-13 11:48:42 -08:00
Jamie Gennis
c75d901cc4 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
9aba2324ac Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb 2011-01-13 11:29:14 -08:00
Gloria Wang
1dac4cdd6f am a220a297: Merge "Initial OMA DRM forward lock contribution" 
* commit 'a220a2979937700024662be0f8fc166ca65506ed':
  Initial OMA DRM forward lock contribution
 2011-01-13 11:11:51 -08:00
Eric Fischer
a37d341bf4 am 39d80c38: Merge "Import revised translations." into honeycomb 
* commit '39d80c3846972e6204dfd956263a3fb6a799444d':
  Import revised translations.
 2011-01-13 11:03:47 -08:00
Eric Fischer
39d80c3846 Merge "Import revised translations." into honeycomb 2011-01-13 10:59:52 -08:00
Gloria Wang
a220a29799 Merge "Initial OMA DRM forward lock contribution" 2011-01-13 10:51:13 -08:00
Xavier Ducrohet
b7f50928a3 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
310a4d815b LAyoutLib: Fix build by adding missing IWindowSession implementation. 
Change-Id: I0af178d149b782cac3ae0c36fa5fc03f4dc6118b
 2011-01-13 10:43:00 -08:00
Xavier Ducrohet
5ab7ccdd37 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
2483d087e2 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
02012b3a4b 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
b841fa6302 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
fad58bd4f0 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
089971eaba 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
575fbf612a 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
1f1957f50f Merge "LayoutLib: move MockView back into its original package." into honeycomb 2011-01-13 10:22:53 -08:00
Xavier Ducrohet
66a95e4dbe Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb 2011-01-13 10:22:43 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Jaikumar Ganesh
56eaabd4c5 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
baa82f19ea am d88ad4ab: Merge "Documentation" into honeycomb 
* commit 'd88ad4ab49280a19da6582ba6e776c296be79ec0':
  Documentation
 2011-01-13 10:20:28 -08:00
Robert Greenwalt
4b43f94499 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
89d391a978 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
c506ab8950 am 4330b146: Adding ASL2 attribution for VisualOn. 
* commit '4330b1464d26fa693b61d496092e10ce0419ee3d':
  Adding ASL2 attribution for VisualOn.
 2011-01-13 10:19:29 -08:00
Svetoslav Ganov
06e32b434b 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
b54fd91d1b 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
d88ad4ab49 Merge "Documentation" into honeycomb 2011-01-13 10:14:14 -08:00
Robert Greenwalt
495056ab67 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Gilles Debunne
b439221a5a Merge "QuickContactBadge shows its pressed state" into honeycomb 2011-01-13 09:50:40 -08:00
Staffan Lindvall
81f8e3c85f Phone crash when old callback func is woken up when enabling BT. 
When the remote Jerry device is powered down the BT link to the
phone is dropped, and the Jerry firmware in the phone quite
immediately tries to re-connect to the Jerry device. Then
SDP and Discover Services is started, fetchRemoteUuids() ->
discoverServicesNative(). This results in an asynchronous dbus
call dbus_func_args_async()  that is provided with a callback
function, onDiscoverServicesResult(), but before this callback
function is used Bluetooth is disabled according to the problem
scenario above. For some reason this discover services activity
is not cleared when Bluetooth is disabled, so when Bluetooth
is enabled again the (old) callback function
onDiscoverServicesResult() is executed, but the following
getAddressFromObjectPath() fails. The reason for this is that
the deviceObjectPath parameter contains an old value,
containg the process id of the old bluetoothd (the one running
before Bluetooth was disabled). Then the new updated
AdapterObjectPath /org/bluez/<new bluetooth hd pid>/hci0/dev_
is not a prefix of the old deviceObjectPath /org/bluez/<old
bluetooth hd pid>/hci0/dev_<BT_ADDR>, which results in that null
will be used as address in sendUuidIntent(), and later on,
ending up in the BluetoothDevice constructor where and
IllegalArgumentExceotion is thrown due to
Bluetooth address = null. Then the phone will crash.

Making sure sendUuidIntent() is not called when address is null
is a work-around for the problem.

Change-Id: I8ff60bad80de3b379cef0970402943dfa4de3cfd
 2011-01-13 09:28:48 -08:00
Dan Morrill
4330b1464d Adding ASL2 attribution for VisualOn. 
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
 2011-01-13 09:24:30 -08:00
Jason parks
282e1c4ffa 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
da6f7dbf9f 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
21f62b9e46 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
ca6777b23b Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Marco Nelissen
d6129b793f am f679ba7d: Cherrypick from GB. Do Not Merge. 
* commit 'f679ba7d944a403fbdc77926c44978ffd5161f2d':
  Cherrypick from GB. Do Not Merge.
 2011-01-13 07:31:53 -08:00