Commit Graph

8590 Commits

Author SHA1 Message Date
c0cec62454 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: Icf0abeb3dfc794bb3371b1c427aa15755fbe84c7
2010-05-04 15:56:11 -07:00
ca4d4de865 Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken 2010-05-04 15:53:31 -07:00
9997f66f62 Revert "Fix runtime reboot when connecting to a A2DP headset and"
This reverts commit 55b0110fc2.
2010-05-04 15:52:42 -07:00
37f4f5b1ea am d135f74b: am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken

* commit 'd135f74b972b88de2ae8b11b3ada886d29c1e25d':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:41:41 -07:00
d135f74b97 am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
55b0110fc2 Fix runtime reboot when connecting to a A2DP headset and
user toggles BT state.

Bug:2607218

This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.

Change-Id: I023406ec6d59880754ca4f1de676d0dce71b13c6
2010-05-04 15:28:27 -07:00
151af19bf4 Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Change-Id: I841a37349fbc6af33073aaecae903eb8999cc5bd
2010-05-04 14:44:45 -07:00
ebad36db56 am 5c16039a: am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken

* commit '5c16039adfe3da2d9438b8814734f5c8d2570ad3':
  docs: revise and add documentation for backup APIs
2010-05-04 14:22:47 -07:00
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
07779ac16e am 77da7312: am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken

* commit '77da7312215c4a433e3f53c2fe306307fc3bad52':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:45:44 -07:00
77da731221 am f140be6c: Call into app widget hosts when the provider is updated.
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
2010-05-04 12:37:59 -07:00
f140be6c3c Call into app widget hosts when the provider is updated.
Change-Id: If0a2459901e88cf04810b23178e4673d44fa69cc
2010-05-04 11:49:12 -07:00
dcb5f18fd6 am 007ad770: merge from open-source master
Merge commit '007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken

* commit '007ad7700a23ff7e618cfeee1eab97063c93b800':
  Adapt to new location of libcore
  Parse custom text header and ignore it.
  Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
  'uses-library' was not working for persistent applications.
  Fix an NPE in InputMethodService when mExtractAction is null.
2010-05-03 16:25:15 -07:00
007ad7700a merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
2010-05-03 16:19:31 -07:00
d17da43c82 docs: revise and add documentation for backup APIs
Change-Id: I0b015a6de16da07ccd31756b8d2329dc2785c2f7
2010-04-29 21:42:58 -07:00
22ec9ab3b8 Fix build.
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -07:00
8abcce1f7b am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken

* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
  Expose _id in ExtendedProperties subValues
2010-04-29 16:28:50 -07:00
9ca816649b am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
2010-04-29 15:40:30 -07:00
42b21c3333 Parse custom text header and ignore it.
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.

Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
2010-04-30 07:11:53 +09:00
8f643c1040 Expose _id in ExtendedProperties subValues
* ExtendedValues' "name" and "value" columns are exposed in Entry
  entity subvalues, but it is clumsy to change a value, as the _id
  of the ExtendedValues row isn't also exposed.  (We otherwise have to
  perform a potentially slow query)
* This CL adds the _id column to the columns exposed

Bug: 2638762
Change-Id: Iaffeffed620af78439f5f73aa5f3257b0f8a0fd0
2010-04-29 14:50:37 -07:00
334dc0b270 Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
And take the first part of parsed as a parent part data.

Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
2010-04-30 05:12:19 +09:00
6bbb65e6fc am 6483f6d5: am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit '6483f6d546655a9579670b42d445614cab609e28' into kraken

* commit '6483f6d546655a9579670b42d445614cab609e28':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:38:41 -07:00
6483f6d546 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
2010-04-28 19:34:49 -07:00
14cee9f688 New xlarge screen size.
Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
2010-04-28 16:51:52 -07:00
59eb69192c Fix an NPE in InputMethodService when mExtractAction is null.
This happens with certain third-party IMEs.

Fixes: http://code.google.com/p/cyanogenmod/issues/detail?id=231

Change-Id: Idf4349ee9c7c8f73c255745bc65b49ba9b593874
2010-04-28 16:37:01 -07:00
b40c42f1ff Fix bug 2639949 - Don't stop a Scroller early
Change-Id: Ia827199a27d03289b6fa573dd6f2b13517943400
2010-04-28 16:36:37 -07:00
3fd6419fe5 am 3b20c9e8: am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken

* commit '3b20c9e80533401d8c423977ef86460d789d4e1e':
  Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:07:18 -07:00
3b20c9e805 am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp

* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
  Fix a minor bug in transitions to left-edge-up landscape.
2010-04-28 16:03:28 -07:00
81ac367be6 Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 15:59:39 -07:00
43f2c35bf3 am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken

* commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
2010-04-28 15:42:23 -07:00
91a62f3d4a am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp

* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
2010-04-28 15:38:44 -07:00
020e534579 bug:2622719 move 'forcing of cursor execution' to ContentProvider
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR

Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
2010-04-28 15:32:54 -07:00
c64d537e9b Fix a minor bug in transitions to left-edge-up landscape.
Fix MAX_TRANSITION_TILT to remove the entry for upside-down
orientation, which should've been removed when that orientation itself
was removed.  This was causing the phone to require further vertical
tilt for transitions to left-edge-up landscape, as compared to
right-edge-up landscape or portait mode.

Bug: 2639310
Change-Id: I8fe2e2baecd6a9c2cecae95d316b0d4e2f8ee251
2010-04-28 15:08:45 -07:00
2bf0f1a3c1 am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken

* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
  revert a change in the SyncManager that caused it to not cancel
2010-04-28 14:18:19 -07:00
00b92b943f am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
2010-04-28 14:13:55 -07:00
9aaf24f2a4 Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:10:05 -07:00
6813f8d291 am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken

* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
  remove myname accidentally included in one of the files
2010-04-27 16:53:16 -07:00
785c898357 am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp

* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
  remove myname accidentally included in one of the files
2010-04-27 16:49:29 -07:00
16afc5ed56 am 048b40eb: am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken

* commit '048b40ebdc980906193cfcb66274e2a1f3ec6093':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
2010-04-27 16:45:19 -07:00
996960dea8 Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 16:44:58 -07:00
048b40ebdc am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit 'e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp

* commit 'e367896e91a0d75250f00f2de3929495595719d4':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
2010-04-27 16:42:42 -07:00
e367896e91 Merge "Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo 2010-04-27 16:39:44 -07:00
12664a7a4d revert a change in the SyncManager that caused it to not cancel
long running syncs if the next sync had the same account and
authority.

Change-Id: I0c18ce3b7098e79e2080e401e441ad246b1d6910
http://b/2631221
2010-04-27 16:33:19 -07:00
0f43f2f700 remove myname accidentally included in one of the files
Change-Id: I189db1cc60069b4318fa32a8b5aea6916ac5aa4e
2010-04-27 16:24:20 -07:00
18ee31e897 Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
Take care of the window manager destroying a surface, to report to the
app that it has been destroyed.  Make sure to perform a traversal when
becoming visible to re-create the surface if needed.

Change-Id: If3bc05e0106f90d4c3bad2d7575212667680fbc8
2010-04-27 15:55:30 -07:00
7095d75ead am 447beb52: am 05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '447beb52be8f97154db2273b4130fd83bf34d840' into kraken

* commit '447beb52be8f97154db2273b4130fd83bf34d840':
  Add good international characters to the path part of Url pattern.
2010-04-27 12:37:41 -07:00
447beb52be am 05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp

* commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14':
  Add good international characters to the path part of Url pattern.
2010-04-27 12:34:03 -07:00
05fd7e7d32 Add good international characters to the path part of Url pattern.
Change-Id: Ib24f8ffc8554366cb4350ec2f9d7e77efb0cb083
2010-04-27 20:23:55 +01:00
067521f95e am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo
Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken

* commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0':
  Fix a WebView scrolling regression - bug 2633572.
2010-04-27 12:11:04 -07:00