OSDN Git Service
Kenny Root [Thu, 10 Jun 2010 05:35:55 +0000 (22:35 -0700)]
am
c46f03e4: am
36921ad8: am
b00854d4: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:33:47 +0000 (22:33 -0700)]
am
36921ad8: am
b00854d4: Import revised translations
Kenny Root [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
Dmitri Plotnikov [Thu, 10 Jun 2010 03:22:03 +0000 (20:22 -0700)]
Merge "Adding a stopLoading() method."
Mathias Agopian [Thu, 10 Jun 2010 02:57:01 +0000 (19:57 -0700)]
am
e52d66fa: am
44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
Mathias Agopian [Thu, 10 Jun 2010 02:55:57 +0000 (19:55 -0700)]
am
44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
Mathias Agopian [Thu, 10 Jun 2010 02:54:29 +0000 (19:54 -0700)]
Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
* changes:
update EGL headers to the latest
update GL ES stub libraries with the new GL ES headers
fix OpenGL ES extension headers from khronos
update the OpenGL ES headers to the latest
Mathias Agopian [Thu, 10 Jun 2010 01:46:35 +0000 (18:46 -0700)]
update EGL headers to the latest
note that this doesn't update the EGL stubs.
Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
Romain Guy [Thu, 10 Jun 2010 01:27:31 +0000 (18:27 -0700)]
Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class."
Mathias Agopian [Thu, 10 Jun 2010 01:20:21 +0000 (18:20 -0700)]
update GL ES stub libraries with the new GL ES headers
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
Mathias Agopian [Thu, 10 Jun 2010 01:19:11 +0000 (18:19 -0700)]
fix OpenGL ES extension headers from khronos
the official headers have a couple typos, which
this CL fixes.
Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
Mathias Agopian [Thu, 10 Jun 2010 01:08:15 +0000 (18:08 -0700)]
update the OpenGL ES headers to the latest
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
Robert Greenwalt [Thu, 10 Jun 2010 00:11:05 +0000 (17:11 -0700)]
Merge "Clean up APN notifications."
Jean-Baptiste Queru [Wed, 9 Jun 2010 23:12:11 +0000 (16:12 -0700)]
am
030b0ebe: merge from froyo-plus-aosp
Jean-Baptiste Queru [Wed, 9 Jun 2010 23:09:19 +0000 (16:09 -0700)]
merge from froyo-plus-aosp
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
Jason Sams [Wed, 9 Jun 2010 22:54:35 +0000 (15:54 -0700)]
Merge "Remove float8/16 from RS type list. We will not have time to work through ABI issues for these types on arm for our ship date. Can be re-added later."
Nick Kralevich [Wed, 9 Jun 2010 22:26:41 +0000 (15:26 -0700)]
am
69b04a70: am
2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
Joe Onorato [Wed, 9 Jun 2010 22:07:16 +0000 (15:07 -0700)]
resolved conflicts for merge of
f7b79151 to master
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
Nick Kralevich [Wed, 9 Jun 2010 21:50:10 +0000 (14:50 -0700)]
am
2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken
Nick Kralevich [Wed, 9 Jun 2010 21:49:10 +0000 (14:49 -0700)]
Merge "Fix a problem with leaking UDP sockets." into kraken
Joe Onorato [Wed, 9 Jun 2010 21:47:43 +0000 (14:47 -0700)]
am
b5f9b4f1: am
302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
Joe Onorato [Wed, 9 Jun 2010 21:47:18 +0000 (14:47 -0700)]
am
ae706c10: Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
Joe Onorato [Wed, 9 Jun 2010 21:45:31 +0000 (14:45 -0700)]
am
302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
Joe Onorato [Wed, 9 Jun 2010 21:44:58 +0000 (14:44 -0700)]
Merge changes Ia5884ef4,Ie495a41d,I3f7066c2,If5faf446,I6ae0740f,I57b2d296,Iea78a637 into kraken
* changes:
Add a test item the turns on a bunch of extra icons.
Move the status bar icon list, hopefully for the last time.
Call into the notification manager when the panel is revealed.
Move status_bar_latest_event and LatestItemView into SystemUI.apk.
Start the status bar service based on a configuration option, instead of trampolining through a braodcast receiver.
Require the STATUS_BAR_SERVICE permission for something to be the status bar.
Handle errors inflating notifications (and their icons).
Joe Onorato [Wed, 9 Jun 2010 21:43:47 +0000 (14:43 -0700)]
Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
* changes:
dead code removal
Cap the number of notifications that a given package can post.
Move the usb mass storage notification & activity into SystemUI.apk.
Add some disabled logging and another test case for reapplying the notification views.
Dianne Hackborn [Wed, 9 Jun 2010 19:29:51 +0000 (12:29 -0700)]
Merge "Add Fragment option menu APIs."
Christopher Tate [Wed, 9 Jun 2010 19:27:58 +0000 (12:27 -0700)]
am
7e8566a6: am
d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
Christopher Tate [Wed, 9 Jun 2010 19:26:38 +0000 (12:26 -0700)]
am
d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
Christopher Tate [Wed, 9 Jun 2010 19:25:05 +0000 (12:25 -0700)]
Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken
The Android Open Source Project [Wed, 9 Jun 2010 19:17:03 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
The Android Open Source Project [Wed, 9 Jun 2010 19:14:58 +0000 (12:14 -0700)]
merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
Derek Sollenberger [Wed, 9 Jun 2010 18:51:48 +0000 (11:51 -0700)]
Merge "Consolidate common zoom code and tighten access to some ZoomManager variables."
James Dong [Wed, 9 Jun 2010 18:31:47 +0000 (11:31 -0700)]
am
689497fb: am
457d5ae3: Fix a potential(observed sometimes) media server crash
James Dong [Wed, 9 Jun 2010 18:29:30 +0000 (11:29 -0700)]
am
457d5ae3: Fix a potential(observed sometimes) media server crash
Jean-Baptiste Queru [Wed, 9 Jun 2010 17:51:16 +0000 (10:51 -0700)]
Merge "Adding mimetypes to the mimetype map used in the web view"
The Android Open Source Project [Wed, 9 Jun 2010 16:21:39 +0000 (09:21 -0700)]
ignore from open-source master
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
Jean-Baptiste Queru [Wed, 9 Jun 2010 14:28:50 +0000 (07:28 -0700)]
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
The Android Open Source Project [Wed, 9 Jun 2010 14:14:36 +0000 (07:14 -0700)]
merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
Kenny Root [Tue, 8 Jun 2010 19:34:43 +0000 (12:34 -0700)]
Add invariant check for stylesString size
It was possible for stylesStrings to claim to start past the end of the
data area thereby making mStringPoolSize larger than the data area.
Change-Id: Ibc4d5b429e3a388516135801c8abc3681daae291
Mathias Agopian [Wed, 9 Jun 2010 03:18:05 +0000 (20:18 -0700)]
am
34e5d967: am
55f8209d: Merge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 03:15:56 +0000 (20:15 -0700)]
am
55f8209d: Merge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 03:14:11 +0000 (20:14 -0700)]
Merge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 02:54:15 +0000 (19:54 -0700)]
allow re-targetting of surfaces
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.
Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
Adam Powell [Wed, 9 Jun 2010 00:27:09 +0000 (17:27 -0700)]
Merge "Dropdown mode for ActionBar; style and API updates"
Jim Miller [Tue, 8 Jun 2010 23:37:12 +0000 (16:37 -0700)]
am
db603bb5: am
3b68548d: am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Jim Miller [Tue, 8 Jun 2010 23:35:21 +0000 (16:35 -0700)]
am
3b68548d: am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Jim Miller [Tue, 8 Jun 2010 23:33:26 +0000 (16:33 -0700)]
am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken
* commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix
2737842: Disable KeguardManager API if device policy is enabled
Jim Miller [Tue, 8 Jun 2010 23:33:22 +0000 (16:33 -0700)]
am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp
* commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix
2737842: Disable KeguardManager API if device policy is enabled
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Mathias Agopian [Tue, 8 Jun 2010 22:49:45 +0000 (15:49 -0700)]
am
37583aeb: am
1debc665: fix [
2751143] Device crashes when in a text box for too long
Mathias Agopian [Tue, 8 Jun 2010 22:47:37 +0000 (15:47 -0700)]
am
1debc665: fix [
2751143] Device crashes when in a text box for too long
Jason Sams [Tue, 8 Jun 2010 22:43:57 +0000 (15:43 -0700)]
Merge "Begin using reflected files."
Jean-Baptiste Queru [Tue, 8 Jun 2010 22:43:02 +0000 (15:43 -0700)]
Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
Mathias Agopian [Tue, 8 Jun 2010 22:40:56 +0000 (15:40 -0700)]
fix [
2751143] Device crashes when in a text box for too long
The Android Open Source Project [Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)]
merge from open-source master
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
James Dong [Tue, 8 Jun 2010 20:17:07 +0000 (13:17 -0700)]
am
d49c9818: am
c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken
James Dong [Tue, 8 Jun 2010 20:15:47 +0000 (13:15 -0700)]
am
c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken
James Dong [Tue, 8 Jun 2010 20:13:26 +0000 (13:13 -0700)]
Merge "Remove some hard-coded encoding parameters" into kraken
Romain Guy [Tue, 8 Jun 2010 20:05:31 +0000 (13:05 -0700)]
am
c62c4c8b: am
804d0496: am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Romain Guy [Tue, 8 Jun 2010 20:02:14 +0000 (13:02 -0700)]
am
804d0496: am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Romain Guy [Tue, 8 Jun 2010 20:01:05 +0000 (13:01 -0700)]
am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp
* commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
Romain Guy [Tue, 8 Jun 2010 20:00:30 +0000 (13:00 -0700)]
am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken
* commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Kenny Root [Tue, 8 Jun 2010 19:52:57 +0000 (12:52 -0700)]
Merge "Range checking for ResTable_map"
Kenny Root [Tue, 8 Jun 2010 19:45:31 +0000 (12:45 -0700)]
Range checking for ResTable_map
Correct previous offset change and get ready for safe-iop.
Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
Brad Fitzpatrick [Tue, 8 Jun 2010 19:40:57 +0000 (12:40 -0700)]
am
599f7287: am
9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken
Brad Fitzpatrick [Tue, 8 Jun 2010 19:38:52 +0000 (12:38 -0700)]
am
9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken
Brad Fitzpatrick [Tue, 8 Jun 2010 19:37:34 +0000 (12:37 -0700)]
Merge "Log.wtf when databases go to be downgraded." into kraken
James Dong [Tue, 8 Jun 2010 19:00:30 +0000 (12:00 -0700)]
am
15c0c098: am
dae9fd31: Initial check-in for collecting stats from authoring engine at runtime
James Dong [Tue, 8 Jun 2010 18:58:34 +0000 (11:58 -0700)]
am
dae9fd31: Initial check-in for collecting stats from authoring engine at runtime
Kenny Root [Tue, 8 Jun 2010 17:29:17 +0000 (10:29 -0700)]
Merge "Improve checking in aapt dump"
Kenny Root [Tue, 8 Jun 2010 17:16:48 +0000 (10:16 -0700)]
Improve checking in aapt dump
The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"
Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:19:51 +0000 (10:19 -0700)]
Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https."
James Dong [Tue, 8 Jun 2010 17:17:29 +0000 (10:17 -0700)]
am
ef2ad683: am
31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
Andreas Huber [Tue, 8 Jun 2010 17:15:34 +0000 (10:15 -0700)]
am
ae9348bc: am
097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
James Dong [Tue, 8 Jun 2010 17:15:33 +0000 (10:15 -0700)]
am
31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
Jim Miller [Tue, 8 Jun 2010 17:15:27 +0000 (10:15 -0700)]
am
cfa2d7c9: am
700a9506: am
cb52cb52: Fix SDK build.
Jim Miller [Tue, 8 Jun 2010 17:15:21 +0000 (10:15 -0700)]
am
a9a0a0b2: am
7d70358a: am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 17:15:15 +0000 (10:15 -0700)]
am
40c20b06: am
8a7fa44f: am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 17:15:06 +0000 (10:15 -0700)]
am
fe2c0864: am
0bc0a46a: am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
James Dong [Tue, 8 Jun 2010 17:14:26 +0000 (10:14 -0700)]
Merge "Second part of speeding up video recording frame rate" into kraken
Robert Greenwalt [Tue, 8 Jun 2010 17:13:25 +0000 (10:13 -0700)]
Merge "resolved conflicts for merge of
ee09dc67 to master"
Robert Greenwalt [Tue, 8 Jun 2010 17:10:54 +0000 (10:10 -0700)]
resolved conflicts for merge of
ee09dc67 to master
Change-Id: I8b0b595580d9c6d44b84e636012705dc913fa6ac
Kenny Root [Tue, 8 Jun 2010 16:34:39 +0000 (09:34 -0700)]
Merge "Include stdlib to fix sim build"
Andreas Huber [Tue, 8 Jun 2010 16:20:59 +0000 (09:20 -0700)]
am
097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
Andreas Huber [Tue, 8 Jun 2010 16:19:07 +0000 (09:19 -0700)]
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
Ben Murdoch [Tue, 8 Jun 2010 09:46:21 +0000 (02:46 -0700)]
Merge "DumpRenderTree fix."
Jim Miller [Tue, 8 Jun 2010 04:25:15 +0000 (21:25 -0700)]
am
700a9506: am
cb52cb52: Fix SDK build.
Jim Miller [Tue, 8 Jun 2010 04:23:53 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 04:23:33 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 02:28:08 +0000 (19:28 -0700)]
am
7d70358a: am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Jim Miller [Tue, 8 Jun 2010 02:26:28 +0000 (19:26 -0700)]
am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp
* commit '
bde25c207731783a62e3611586fe05cd35add0d9':
Fix
2737842: disable keyguard API when device policy is enabled.
Jim Miller [Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)]
am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9' into kraken
* commit '
bde25c207731783a62e3611586fe05cd35add0d9':
Fix
2737842: disable keyguard API when device policy is enabled.
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:50:44 +0000 (18:50 -0700)]
am
8a7fa44f: am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Christopher Tate [Tue, 8 Jun 2010 01:49:07 +0000 (18:49 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Christopher Tate [Tue, 8 Jun 2010 01:48:27 +0000 (18:48 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 01:34:10 +0000 (18:34 -0700)]
am
0bc0a46a: am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 01:32:41 +0000 (18:32 -0700)]
am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Merge commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp
* commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #
2749322: addPackageToPreferred throws SecurityException
OSDN Git Service
