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

51239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
8c35086b97 Reconcile with honeycomb-release 
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
 2011-05-20 14:33:41 -07:00
Dianne Hackborn
5c8caba2e5 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 14:32:35 -07:00
Dianne Hackborn
1b144e625f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Robert Greenwalt
dec3dda873 Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE 2011-05-20 14:25:29 -07:00
Jaikumar Ganesh
d1735ef91a am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:21:29 -07:00
Jaikumar Ganesh
d7030e551a am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit '198ed3e46af4bd51fa6be0186bacdde9e832ba94':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:21:23 -07:00
Xavier Ducrohet
f791863f0a Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:47 -07:00
Xavier Ducrohet
bb43828aa7 Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 2011-05-20 13:56:42 -07:00
The Android Open Source Project
9787eba4dc Reconcile with gingerbread-release 
Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
 2011-05-20 13:50:51 -07:00
Jaikumar Ganesh
4b41df613d Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
198ed3e46a Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Jim Miller
940138de9e am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '0a734b1894511e833936362820c9e8fec3ca7df3':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:27:25 -07:00
Jim Miller
7d75e772cb am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit 'ef2b26695e7fa00419787bb105d448a457e9ed83':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:27:00 -07:00
Jim Miller
0a734b1894 am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-20 13:16:47 -07:00
Jim Miller
ef2b26695e am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '5e731140f38e06c42885fa300efc30da00711c76':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:16:43 -07:00
Mathias Agopian
8e4ee2d709 Merge "Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default" 2011-05-20 13:15:20 -07:00
Adam Powell
d0693bb603 am f2004180: am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f2004180f828584fa8525081a248e8c0f2055327':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:13:28 -07:00
Jim Miller
14e45f9b19 Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 2011-05-20 13:13:19 -07:00
Jim Miller
5e731140f3 Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 2011-05-20 13:12:57 -07:00
Adam Powell
f2004180f8 am f5abccef: am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit 'f5abccefb10e8a31363c98d6a8491cb8168b7174':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:09:13 -07:00
Adam Powell
f5abccefb1 am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
  New opaque cab assets; search dialog tweaks.
 2011-05-20 13:04:11 -07:00
Adam Powell
73a31ec91c Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Dianne Hackborn
ea2117bdc0 Add ParcelFileDescriptor.fromFd() and .adoptFd(). 
Change-Id: I2fe0429188dc80abaa0c8977f2e43a010e0f4da2
 2011-05-20 12:48:22 -07:00
Wink Saville
fe071d3d37 Change getLteOnCdmaModeStatic to dynamically determine its result. 
bug: 4202572
Change-Id: I956b61840e2043229df29054dd2a6daccd7a845f
 2011-05-20 12:27:16 -07:00
Robert Greenwalt
599115894f Simplfy getActive* calls in ConnectivityService 
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770

Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
 2011-05-20 12:23:41 -07:00
Gloria Wang
24ff7fae02 am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:05:43 -07:00
Gloria Wang
4d8ceada09 am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:02:31 -07:00
Gloria Wang
dbfd055d51 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 10:57:51 -07:00
Jaikumar Ganesh
2300984526 am 3bec9cc2: am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '3bec9cc27a4b87be644533d5fe44358dde399d49':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:55:53 -07:00
Jaikumar Ganesh
3bec9cc27a am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '0c2d82c6f28ab6ec73d66fcc1f62e067829df426':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:51:25 -07:00
Jaikumar Ganesh
0c2d82c6f2 am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem" 
* commit '848a1e3d8522129c8a39d198a10b134926d71bd2':
  OBEX: Fix PrivateOutputStream small write problem
 2011-05-20 10:23:48 -07:00
Gloria Wang
a6f1104b9d Use pread() to get the decrypted data for container based DRM file. 
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
 2011-05-20 10:15:21 -07:00
Alex Sakhartchouk
ab68f52dc1 Merge "Removing unused code" 2011-05-20 09:41:07 -07:00
Jaikumar Ganesh
848a1e3d85 Merge "OBEX: Fix PrivateOutputStream small write problem" 2011-05-20 09:40:32 -07:00
Kristian Monsen
56031fb1de Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight" 2011-05-20 08:40:13 -07:00
Chet Haase
9162bca142 Merge "Enable large font rendering with GPU acceleration" 2011-05-20 07:33:41 -07:00
Glenn Kasten
817c161ef2 Bug 4184736 unhide MediaPlayer.setTexture 
Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
 2011-05-20 07:30:00 -07:00
satok
0ca2fda0f7 am 33bdc3c9: (-s ours) am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit '33bdc3c9995cbef477cec756b65d767558e6b836':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 07:03:38 -07:00
satok
33bdc3c999 am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:51:14 -07:00
satok
d9435bcecc am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:41:03 -07:00
satok
208d563404 Fix a bug on SwitchToLastInputMethod 
Change-Id: Iab7531e7436375941ec3df4fba943af24e2f1231
 2011-05-20 22:13:38 +09:00
satok
b4788fdbfd Do not merge. Backport two fixes for InputMethethodFramework 
Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
 2011-05-20 22:11:54 +09:00
Erik Ljungberg
a9c4c594ef OBEX: Fix PrivateOutputStream small write problem 
When data less than max packet size in length is sent into the write
method the data will only be added to the internal buffer. If several
calls to write is performed by the application continueOperation will
not be called at all. The solution to the problem is to always check
the internal buffer size and to call continueOperation every time
maxPacketSize bytes is in the internal buffer.

Change-Id: I5ebfa3c26db2c1aefe1a115d7782d8ceaa760937
 2011-05-20 12:39:18 +02:00
satok
4fc87d61c2 Fix switchToLastInputMethod to fall back into the applicable keyboard if there is no candidate ime 
Change-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
 2011-05-20 18:03:37 +09:00
Dianne Hackborn
fef966ae46 Fix another merge problem. 
Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26
 2011-05-19 22:02:22 -07:00
Dianne Hackborn
161e67ff3b resolved conflicts for merge of 06a8ceac to master 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
 2011-05-19 21:44:52 -07:00
Mathias Agopian
ba3cf46273 Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default 
Change-Id: Ifb2069e095dba57b7d97e9f2d942fd85fa975f58
 2011-05-19 21:01:04 -07:00
Mathias Agopian
9e735541be Merge "Fix a race that could cause GL commands to be executed from the wrong thread." 2011-05-19 19:42:20 -07:00
Mathias Agopian
16fa5aae96 Merge "RefBase subclasses can now decide how they want to be destroyed." 2011-05-19 19:41:37 -07:00
Mathias Agopian
6960811d15 Fix a race that could cause GL commands to be executed from the wrong thread. 
Change-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb
 2011-05-19 19:40:02 -07:00