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

51146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
1c90f032fa Code cleanup. 
Change-Id: I5469a2c826c054f20e045ea098bdbcad9e11b17b
 2011-05-24 14:59:50 -07:00
Glenn Kasten
bdd8a16282 Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead" 2011-05-23 09:06:03 -07:00
Robert Greenwalt
8508485871 am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
  Simplfy getActive* calls in ConnectivityService
 2011-05-21 21:35:38 -07:00
Jaikumar Ganesh
5710e72d91 am 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '69ed0b628e18570f3fc7909fcdadc1e06f42e944':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-21 21:35:22 -07:00
Jaikumar Ganesh
35bfcbb9ab am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'e2271a55ad67f766a6a47239d1a3f7319a1e7b2e':
  BT: Wrong publishing result of bonding error code.
 2011-05-21 21:35:16 -07:00
Jim Miller
4cded6e5ea am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '940138de9eae9be9ef60307af9e5f7a1168af533':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-21 21:35:13 -07:00
Jim Miller
736c987340 am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-21 21:34:56 -07:00
Adam Powell
f746fc9e45 Fix bug 4450805 - item selection dispatching in submenus. 
Change-Id: I6c56c9c8c6bd6c719250df4a21bda7d0ef463de4
 2011-05-20 19:47:16 -07:00
Fabrice Di Meglio
f32e0fe66f Merge "RTL Ordering of visual elements in LinearLayout" 2011-05-20 17:39:40 -07:00
Fabrice Di Meglio
1e4cfbeba5 RTL Ordering of visual elements in LinearLayout 
- also update unit tests for testing LinearLayout

Change-Id: I0794d48c45a8fd4a899fdf6f6a1d05485b416e1a
 2011-05-20 16:23:36 -07:00
Robert Greenwalt
5a6bec53e2 resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
 2011-05-20 15:45:55 -07:00
Glenn Kasten
850ae9acda Merge "Bug 4184736 unhide MediaPlayer.setTexture" 2011-05-20 15:42:31 -07:00
Jaikumar Ganesh
69ed0b628e am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:52:48 -07:00
Jaikumar Ganesh
e2271a55ad am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:52:27 -07:00
The Android Open Source Project
cbc38e74f0 Reconcile with honeycomb-mr1-release 
Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95
 2011-05-20 14:36:37 -07:00
The Android Open Source Project
8c35086b97 Reconcile with honeycomb-release 
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
 2011-05-20 14:33:41 -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
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
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