7217 Commits

Author SHA1 Message Date
Dianne Hackborn
af1f42be96 Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed.  This was possible because these are different
IPC interfaces so will not be serialized.  The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.

Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
2009-11-20 16:27:27 -08:00
Dianne Hackborn
5973cbc163 am e71db657: am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20'

* commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:31:17 -08:00
Dianne Hackborn
e71db6579c am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691' into eclair-mr2-plus-aosp

* commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:26:50 -08:00
Dianne Hackborn
f29006000c am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2

* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:20:34 -08:00
Ken Shirriff
710ac46b0d am 10a02fb7: am f8c2bb36: Add gservices flags for calendar sync.
Merge commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e'

* commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e':
  Add gservices flags for calendar sync.
2009-11-20 14:40:48 -08:00
Ken Shirriff
10a02fb7e4 am f8c2bb36: Add gservices flags for calendar sync.
Merge commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp

* commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4':
  Add gservices flags for calendar sync.
2009-11-20 14:35:22 -08:00
Ken Shirriff
f8c2bb36f7 Add gservices flags for calendar sync. 2009-11-20 14:27:58 -08:00
Dianne Hackborn
b8d8167955 Debugging for issue #2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future.  (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
2009-11-20 14:26:42 -08:00
Vasu Nori
8914a04b16 am 483ae632: am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '483ae6328701d29e9731af25c64b09b1e18bc2e7'

* commit '483ae6328701d29e9731af25c64b09b1e18bc2e7':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:19:49 -08:00
Vasu Nori
483ae63287 am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp

* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:14:45 -08:00
Vasu Nori
5a03f36ef8 maintain cache of statementids returned by sqlite upon compiling a sql stmnt 2009-11-20 14:09:24 -08:00
Jaikumar Ganesh
b148bc844e Fix pairings lost on reboot.
Bug:2277376
Dr No:Eastham
2009-11-20 13:50:26 -08:00
Scott Main
798e043986 am 7dba47c8: am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '7dba47c866b126d26dec2afe18164ce73016bc46'

* commit '7dba47c866b126d26dec2afe18164ce73016bc46':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:10:49 -08:00
Scott Main
7dba47c866 am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp

* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:05:56 -08:00
Scott Main
cb5966426a am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:00:28 -08:00
Mike Lockwood
347ed410c2 am 9d633968: am 401a712e: IPowerManager: remove some unused methods.
Merge commit '9d633968ceb502e95f9785b169742624f72614f5'

* commit '9d633968ceb502e95f9785b169742624f72614f5':
  IPowerManager: remove some unused methods.
2009-11-20 10:00:16 -08:00
Mike Lockwood
9d633968ce am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
2009-11-20 09:56:25 -08:00
Scott Main
e16113998b am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 09:54:22 -08:00
Mike Lockwood
401a712e3b IPowerManager: remove some unused methods.
Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 11:50:21 -05:00
Ben Murdoch
fda04eb9aa am c26197e0: am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25'

* commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:24:03 -08:00
Ben Murdoch
c26197e02c am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp

* commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:20:02 -08:00
Ben Murdoch
7caaeecce1 Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
BUG=b/2271636

Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9
2009-11-20 10:14:46 +00:00
Daisuke Miyakawa
7fee29dafd am 4ee476ef: am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f'

* commit '4ee476ef94f7834c18ee378c788abcdb0728954f':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:23:38 -08:00
Daisuke Miyakawa
4ee476ef94 am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp

* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:19:32 -08:00
Daisuke Miyakawa
a750fdd765 Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Internal issue number: 2195990
2009-11-20 16:13:07 +09:00
Doug Zongker
81e3048020 am 043c7276: am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '043c72766248d0a4783c506fd4f604ed63e763d4'

* commit '043c72766248d0a4783c506fd4f604ed63e763d4':
  fix bad link in javadoc that's breaking SDK build
2009-11-19 18:30:14 -08:00
Dianne Hackborn
187f0749b8 am 79374643: am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '7937464319133d478d5e8b386e9d08668eddd8a9'

* commit '7937464319133d478d5e8b386e9d08668eddd8a9':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:29:46 -08:00
Doug Zongker
043c727662 am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp

* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
  fix bad link in javadoc that's breaking SDK build
2009-11-19 18:23:52 -08:00
Dianne Hackborn
7937464319 am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair
Merge commit 'b9ab71263ebff601a7c5e00258d92493de85fb36' into eclair-mr2-plus-aosp

* commit 'b9ab71263ebff601a7c5e00258d92493de85fb36':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:23:31 -08:00
Doug Zongker
6fd4e76ca1 fix bad link in javadoc that's breaking SDK build 2009-11-19 18:17:15 -08:00
Dianne Hackborn
b9ab71263e am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:06:06 -08:00
Doug Zongker
608620da67 am a7ad3f6c: am 50a21f4d: add reboot() method to PowerManager
Merge commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0'

* commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0':
  add reboot() method to PowerManager
2009-11-19 17:45:39 -08:00
Daisuke Miyakawa
35e3d527d3 am 1b3a7b43: am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'

* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 17:42:27 -08:00
Grace Kloba
42328e3a1f am 3003f30d: am 98fdda09: Merge change I86773fbb into eclair-mr2
Merge commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601'

* commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601':
  If overview width is the same as the current width,
2009-11-19 17:41:56 -08:00
Steve Block
cfdd6cd352 am 74dcb02f: am 57534f1b: Improves documentation for GeolocationPermissions class.
Merge commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72'

* commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72':
  Improves documentation for GeolocationPermissions class.
2009-11-19 17:41:13 -08:00
Fred Quintana
3ab6aeefcd am f1efe8e3: am f61ab007: am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place
Merge commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715'

* commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715':
  -hide AccountManagerResponse, which never should have been exposed in the first place
2009-11-19 17:40:45 -08:00
Dianne Hackborn
6a682f72f7 am 805df376: am 4ee93666: am e4260f4e: Fix build.
Merge commit '805df37632f9736ed7e66f0a51e16abae71414ce'

* commit '805df37632f9736ed7e66f0a51e16abae71414ce':
  Fix build.
2009-11-19 17:40:21 -08:00
lknguyen
c9a306c409 am 904a4b7a: am 8250530c: Merge change I194f0808 into eclair-mr2
Merge commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7'

* commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7':
  Add Gservices flag so that Market can turn on performance logging for specific groups.
2009-11-19 17:38:11 -08:00
Doug Zongker
a7ad3f6c71 am 50a21f4d: add reboot() method to PowerManager
Merge commit '50a21f4d3b70360b36acad20e234c380654fd59f' into eclair-mr2-plus-aosp

* commit '50a21f4d3b70360b36acad20e234c380654fd59f':
  add reboot() method to PowerManager
2009-11-19 17:28:42 -08:00
Doug Zongker
50a21f4d3b add reboot() method to PowerManager
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery.  Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
2009-11-19 17:18:31 -08:00
Dianne Hackborn
08ee42ce86 More on issue #2271640: Fix wallpaper etc docs
Publish the features developers may be interested in.

Change-Id: I7d40ad9a9f4b9770e2f8dd1b0a729b0d322c062e
2009-11-19 17:08:01 -08:00
Scott Main
6d95fc0a2c docs for ESR: add docs to bluetooth explainin that discovery should
be cancelled before connecting to a device

bug: 2160782,2198463
2009-11-19 17:06:54 -08:00
Dianne Hackborn
415e045add Hopefully fix integration. 2009-11-19 15:29:53 -08:00
Dianne Hackborn
1c391ed88c resolved conflicts for merge of a82e7e24 to master 2009-11-19 14:26:47 -08:00
Daisuke Miyakawa
1b3a7b433c am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp

* commit 'eb114de5037bba89333bd7d57d305ae989727096':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 14:18:11 -08:00
Android (Google) Code Review
eb114de503 Merge change I639b0f03 into eclair-mr2
* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
2009-11-19 14:13:31 -08:00
Daisuke Miyakawa
639b0f032b Make vCard exporter append neighborhood to locality field instead of extended address,
per China convention.

Internal issue number: 2195990
2009-11-20 07:06:40 +09:00
Grace Kloba
3003f30dde am 98fdda09: Merge change I86773fbb into eclair-mr2
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp

* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
  If overview width is the same as the current width,
2009-11-19 13:51:20 -08:00
Android (Google) Code Review
98fdda0925 Merge change I86773fbb into eclair-mr2
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
2009-11-19 13:47:24 -08:00
Steve Block
74dcb02f59 am 57534f1b: Improves documentation for GeolocationPermissions class.
Merge commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66' into eclair-mr2-plus-aosp

* commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66':
  Improves documentation for GeolocationPermissions class.
2009-11-19 12:08:01 -08:00