Commit Graph

5263 Commits

Author SHA1 Message Date
Evan Millar
9f26c2d2b1 am 62ad899f: am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'

* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:30:10 -08:00
Evan Millar
62ad899fa6 am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp

* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:21:24 -08:00
Evan Millar
087c06039f am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:04:18 -08:00
Android (Google) Code Review
2b3970a295 Merge change Idc1396c8 into eclair
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 16:56:51 -05:00
Michael Chan
56336c6109 am e4f5e840: am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair
Merge commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5'

* commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:47:16 -08:00
Christopher Tate
b333cdb48f am f5f452fa: am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit 'f5f452facab27a4c05361f9a61cee2098c2d5043'

* commit 'f5f452facab27a4c05361f9a61cee2098c2d5043':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:42:37 -08:00
Dan Egnor
b6b1977107 am 77be730a: am 883be83e: Merge change I2effb21e into eclair-mr2
Merge commit '77be730ace28b9e6543da25f53305496402af295'

* commit '77be730ace28b9e6543da25f53305496402af295':
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 13:42:25 -08:00
Michael Chan
e4f5e840a3 am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp

* commit '811f655366461d0f21f970bcac07dd2084fd54fa':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:42:02 -08:00
Christopher Tate
f5f452faca am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp

* commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:34:59 -08:00
Dan Egnor
77be730ace am 883be83e: Merge change I2effb21e into eclair-mr2
Merge commit '883be83eab608237652e013b26fe871c18fa8901' into eclair-mr2-plus-aosp

* commit '883be83eab608237652e013b26fe871c18fa8901':
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 13:34:48 -08:00
Michael Chan
811f655366 am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:33:06 -08:00
Android (Google) Code Review
8d51f7101d Merge change Icdd2864e into eclair
* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 16:23:42 -05:00
Christopher Tate
307fbbf2b6 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:22:54 -08:00
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Charles Mendis
08c2fd1ecc am 7e3873a0: am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7'

* commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 12:00:57 -08:00
Android (Google) Code Review
49fa9e0098 Merge change Ibf6e51b7 into eclair
* changes:
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 15:00:31 -05:00
Evan Millar
dc1396c881 Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Fixes http://b/issue?id=2178591
2009-11-06 11:59:39 -08:00
Charles Mendis
7e3873a0d2 am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp

* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:54:49 -08:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Ken Shirriff
2469925e9e am 3b8ee356: am 300160ed: Merge change I29a3be5b into eclair-mr2
Merge commit '3b8ee3568a50db5b2e526cad0e12c55ec31e3d27'

* commit '3b8ee3568a50db5b2e526cad0e12c55ec31e3d27':
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 11:46:14 -08:00
Android (Google) Code Review
3cba72880b Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Ken Shirriff
3b8ee3568a am 300160ed: Merge change I29a3be5b into eclair-mr2
Merge commit '300160edc936f2b8265900101136068e3912ff33' into eclair-mr2-plus-aosp

* commit '300160edc936f2b8265900101136068e3912ff33':
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 11:35:42 -08:00
Christopher Tate
8ee038d926 Set argv[0] from the main thread of an app, not a random binder thread
Change-Id: Ibf6e51b7975cdb5e6aa97591a571c599ecf84020
2009-11-06 11:30:20 -08:00
Android (Google) Code Review
300160edc9 Merge change I29a3be5b into eclair-mr2
* changes:
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 13:23:27 -05:00
Cary Clark
4e9fe62b37 do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204

check for native initialization before calling public function

Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-11-06 10:29:30 -05:00
Dianne Hackborn
790bc8f147 am 78e502df: am 892574f5: am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '78e502df5163e8bcdd803af7f0a3958322a288dc'

* commit '78e502df5163e8bcdd803af7f0a3958322a288dc':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 22:13:41 -08:00
Dianne Hackborn
78e502df51 am 892574f5: am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp

* commit '892574f5f91b834f70ace880301db61f60d58362':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 22:02:56 -08:00
Dianne Hackborn
892574f5f9 am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 21:57:51 -08:00
Dianne Hackborn
13bf826013 Fix SDK build: a few things missing, a link that was wrong.
Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
2009-11-05 21:45:51 -08:00
Dianne Hackborn
62834b829c am 85fdfd01: am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '85fdfd0144c06dcef7652a8dd283f717cabe8759'

* commit '85fdfd0144c06dcef7652a8dd283f717cabe8759':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:57:33 -08:00
Romain Guy
9aed49e2a5 am 57e7109d: am 15b9de8c: am 1d5b3a63: Fix the build
Merge commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75'

* commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75':
  Fix the build
2009-11-05 20:57:09 -08:00
Dianne Hackborn
85fdfd0144 am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp

* commit '237cc15c171511e8c8ffe903c5d6f473593477b8':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:49:22 -08:00
Dianne Hackborn
237cc15c17 am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:41:50 -08:00
Romain Guy
57e7109d13 am 15b9de8c: am 1d5b3a63: Fix the build
Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp

* commit '15b9de8cf217c315acb57044c43a9b12da57b6c4':
  Fix the build
2009-11-05 20:37:29 -08:00
Dianne Hackborn
274b120f39 Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
2009-11-05 20:35:23 -08:00
Romain Guy
15b9de8cf2 am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-mr2

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 20:27:53 -08:00
Dan Egnor
2effb21e89 Add UPDATE_ACTION to Gservices, used by the new checkin service. 2009-11-05 20:08:49 -08:00
Romain Guy
1d5b3a631c Fix the build
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
2009-11-05 18:45:10 -08:00
Michael Chan
cdd2864eb3 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 2009-11-05 18:32:08 -08:00
Romain Guy
e1cd1ef7b9 am b25cb21f: am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'

* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 16:04:32 -08:00
Jaikumar Ganesh
899ebdf3bf am cc2d3572: am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96'

* commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 16:00:45 -08:00
Romain Guy
b25cb21f59 am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp

* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:57:49 -08:00
Jaikumar Ganesh
cc2d3572e9 am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp

* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 15:50:11 -08:00
Romain Guy
8426319c5a am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:47:43 -08:00
Android (Google) Code Review
f20e9a88a3 Merge change Idf40f3b0 into eclair
* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
2009-11-05 18:42:14 -05:00
Romain Guy
ae8dd29c03 Prevent crash in Home when using widgets whose ids collide with Home's
resources.

Bug #2228943.

Approved by mcleron, triaged by ryanpc.

Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
2009-11-05 15:40:35 -08:00
Jaikumar Ganesh
f53f86a743 am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 15:39:40 -08:00
Ken Shirriff
5b387e16f7 Calendar: add CALLER_IS_SYNCADAPTER parameter. 2009-11-05 15:24:18 -08:00
Android (Google) Code Review
8de4e0ad8f Merge change I21d0dca3 into eclair
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 17:15:51 -05:00