David 'Digit' Turner
50cf2e76ae
am be49703e: am d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.
...
* commit 'be49703e8229f67c3124a58be86577ce1e4d9a3c':
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
2011-09-23 02:57:53 -07:00
David 'Digit' Turner
7a5b4f30a0
am d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.
...
* commit 'd51ecafa6875e182346a825ce098e7c5e0b09038':
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
2011-09-23 02:52:50 -07:00
David 'Digit' Turner
5ca449d57f
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
...
This patch modifies the libEGL.so loader to only load the emulator-specific
EGL/GLES libraries if it detects at runtime that the emulator supports it.
This prevents the system crashing when booting the platform image under an old
emulator version, or one without GPU emulation enabled.
Change-Id: I711b3f0a4ee1f3b080263780726ce7ec28ff11d6
2011-09-16 17:33:28 +02:00
Jean-Baptiste Queru
9c4da6a2a7
Ignore e4f0da70 from gingerbread-plus-aosp
...
Change-Id: I375563d4665ccb1948b17266afdc9c26cc7a7e35
2011-09-12 07:23:08 -07:00
Derek Sollenberger
4ede4f743f
am 5b98d3a7: am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
...
* commit '5b98d3a70d64c46b8d925415a30a7a7d8453d866':
Added interface to SurfaceTexture needed by WebKit.
2011-09-11 07:41:37 -07:00
Derek Sollenberger
42382dd8a7
am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
...
* commit 'e91c8d0414333e4686a4473aaf1d8b1b1e0ba291':
Added interface to SurfaceTexture needed by WebKit.
2011-09-11 07:35:00 -07:00
Robert Greenwalt
8cb463ef9b
am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
...
* commit '2f835a6193c14e27cf761d85ac3ea4c9bd9296f8':
Make copies of NetworkInfo to give out.
2011-09-09 15:52:42 -07:00
Robert Greenwalt
65bdcd5431
Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
2011-09-09 15:51:22 -07:00
Kazuhiro Ondo
c39d52af4a
am b1a3f0ca: Fix no data issue after system server crash
...
* commit 'b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f':
Fix no data issue after system server crash
2011-09-09 15:00:51 -07:00
yoonsung.nam
8be3fc7848
am 37f770f0: DO NOT MERGE: Notify overall state instead of current changed state
...
* commit '37f770f03f975982fbe7a1f133e03724bd3dc81a':
DO NOT MERGE: Notify overall state instead of current changed state
2011-09-09 14:33:33 -07:00
Kazuhiro Ondo
376b9e3431
am eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
...
* commit 'eb7763efa52bad67ff828ad895ff172190e86035':
DO NOT MERGE: Fix leak in SIM ready registrants
2011-09-09 13:55:13 -07:00
Derek Sollenberger
136593f2ea
Added interface to SurfaceTexture needed by WebKit.
...
bug: 5239378
Change-Id: I2d84c95c481515621d2b24a36bc213f4ea5d721a
2011-09-08 15:03:09 -04:00
Xavier Ducrohet
2585ac80e0
am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
2011-08-18 14:48:49 -07:00
Xavier Ducrohet
97dfe9fcc1
am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
2011-08-18 14:45:36 -07:00
Xavier Ducrohet
4141bb21e7
am 21e6e2de: Merge "Change generated dependency file names"
...
* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
2011-08-18 14:41:56 -07:00
Xavier Ducrohet
bcb124929a
Merge "Change generated dependency file names"
2011-08-18 14:29:15 -07:00
Jaikumar Ganesh
167b832f62
am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:10:02 -07:00
Jaikumar Ganesh
7d4e0c49f6
am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:08:05 -07:00
Jaikumar Ganesh
56b33ee2ed
am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
...
* commit '4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
2011-08-18 12:06:25 -07:00
Jaikumar Ganesh
7be5106263
Merge "Bluetooth event loop dispatches dbus data on wakeup"
2011-08-18 12:02:35 -07:00
Xavier Ducrohet
754b249bcd
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
2011-08-17 14:38:15 -07:00
Xavier Ducrohet
242915f3d0
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
2011-08-17 14:35:20 -07:00
Xavier Ducrohet
35302266fa
am a8313e71: Merge "Fix String16 operator+ to actually work"
...
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
2011-08-17 14:31:08 -07:00
Xavier Ducrohet
9f4d9d148f
Merge "Fix String16 operator+ to actually work"
2011-08-17 14:18:04 -07:00
Dianne Hackborn
c9514d2dad
am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
Handle stopping of services with still bound applications.
2011-08-16 20:45:19 -07:00
Dianne Hackborn
bf046a8e05
am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
Handle stopping of services with still bound applications.
2011-08-16 20:42:17 -07:00
Dianne Hackborn
e0233e99cd
am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
Handle stopping of services with still bound applications.
2011-08-16 20:39:50 -07:00
Dianne Hackborn
96fe23ed7b
Merge "Handle stopping of services with still bound applications."
2011-08-16 19:29:25 -07:00
Josiah Gaskin
37bf88e547
Fix String16 operator+ to actually work
...
This change fixes the String16 utility's operator+ function.
Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
2011-08-16 15:16:04 -07:00
Conley Owens
6d9a6567f5
Merge "Add missing include" include exists
2011-08-12 13:40:56 -07:00
Amith Yamasani
501f6256bb
am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
VolumePreference.onActivityStop only stops playback
2011-08-12 13:16:21 -07:00
Conley Owens
3e80266158
Merge "Added stub for getting buffer" stub exists
2011-08-12 13:11:51 -07:00
Jeff Brown
0b7ad37bf7
am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '8f226dcb21c84f5479a0a1b2d6486293dcd2e937':
Fix getSwitchState according to device capabilities.
2011-08-11 16:15:31 -07:00
Jeff Brown
98827f95c6
am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit 'b4459d8d6d5377db2494f5a11124d49194f1044c':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-11 16:13:11 -07:00
Jean-Baptiste Queru
37717b58dc
am b654e6e5: am d144748d: Merge "Add missing include"
...
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
Add missing include
2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
e636a8ad44
am d144748d: Merge "Add missing include"
...
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
Add missing include
2011-08-11 15:18:22 -07:00
Jean-Baptiste Queru
dbd5be5408
Merge "Add missing include"
2011-08-11 13:46:09 -07:00
Jean-Baptiste Queru
2327ffac7d
Add missing include
...
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
2011-08-11 13:36:04 -07:00
Amith Yamasani
23f1724cf7
am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
2011-08-11 12:46:25 -07:00
Amith Yamasani
49934b48b3
am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
VolumePreference.onActivityStop only stops playback
2011-08-11 12:43:44 -07:00
Amith Yamasani
431d7beafe
Merge "VolumePreference.onActivityStop only stops playback"
2011-08-11 12:29:34 -07:00
Jean-Baptiste Queru
65adf39c38
am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture"
...
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
added stub for getting buffer from surface texture
2011-08-11 12:24:51 -07:00
Jean-Baptiste Queru
9f3a33a671
am c962512c: Merge "added stub for getting buffer from surface texture"
...
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
added stub for getting buffer from surface texture
2011-08-11 12:19:44 -07:00
Jean-Baptiste Queru
cff1acf568
Merge "added stub for getting buffer from surface texture"
2011-08-11 12:08:04 -07:00
Chris Craik
f81c168a7a
added stub for getting buffer from surface texture
...
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
2011-08-11 11:56:59 -07:00
Jeff Brown
9f213739b9
am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
Fix getSwitchState according to device capabilities.
2011-08-10 13:59:44 -07:00
Jeff Brown
04eb1755a2
am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit '7e79b9aad85db332d334f8bc1625bf46f030830f':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-10 13:59:41 -07:00
Jeff Brown
38b77d4373
am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
...
* commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
Fix getSwitchState according to device capabilities.
2011-08-10 13:56:33 -07:00
Jeff Brown
4af616cb5a
am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
...
* commit 'dbff91077ddf437b62794e077d2ce9e10fff8170':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
2011-08-10 13:56:31 -07:00
Jeff Brown
c6d6863c9b
Merge "Fix getSwitchState according to device capabilities."
2011-08-10 13:42:03 -07:00