Commit Graph

4099 Commits

Author SHA1 Message Date
Android (Google) Code Review
ad9437d65c Merge change 22661 into eclair
* changes:
  SettingsProvider: Fix botched merge from donut to eclair.
2009-08-25 16:00:54 -07:00
Dianne Hackborn
58fcc677ab am 9acc030b: Implement issue #2071750: add a pre-boot upgrade step.
Merge commit '9acc030be474db2bc2371440a12cbdc478238689' into eclair-plus-aosp

* commit '9acc030be474db2bc2371440a12cbdc478238689':
  Implement issue #2071750: add a pre-boot upgrade step.
2009-08-25 15:34:26 -07:00
Jack Wang
af4c31708f am 1e09e9e0: Merge change 22650 into eclair
Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break
2009-08-25 15:34:21 -07:00
Android (Google) Code Review
681fa08918 Merge change 22650 into eclair
* changes:
  Fix build break - Introduced in 22109
2009-08-25 14:55:27 -07:00
Jason Sams
0bb3fb1418 am cf207b63: Merge change 22651 into eclair
Merge commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612' into eclair-plus-aosp

* commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612':
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
2009-08-25 14:52:04 -07:00
Android (Google) Code Review
acf2c18b38 Merge change 22651 into eclair
* changes:
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
2009-08-25 14:49:55 -07:00
Andreas Huber
2b4e3d7d72 am f96d49a2: Merge change 22646 into eclair
Merge commit 'f96d49a277af9ec888bb7d15988b57989ccb39af' into eclair-plus-aosp

* commit 'f96d49a277af9ec888bb7d15988b57989ccb39af':
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:36:40 -07:00
Android (Google) Code Review
56c6d0b6cf Merge change 22646 into eclair
* changes:
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:35:12 -07:00
johnwang
4906df7329 am 4b474440: Merge change 22566 into eclair
Merge commit '4b474440cef8afa5e355a9406bb076af8e493ca7' into eclair-plus-aosp

* commit '4b474440cef8afa5e355a9406bb076af8e493ca7':
  Simplify CDMA Status Bar icons
2009-08-25 13:42:02 -07:00
Android (Google) Code Review
dbd633aeab Merge change 22566 into eclair
* changes:
  Simplify CDMA Status Bar icons
2009-08-25 13:39:34 -07:00
Jack Wang
7a9e7d116e am c69a8807: Merge change 22109 into eclair
Merge commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543' into eclair-plus-aosp

* commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543':
  Fix bug 1546445: Correct spelling errors in API
2009-08-25 12:48:33 -07:00
Jason Sams
2de0a53851 am 77f77f90: Merge change 22231 into eclair
Merge commit '77f77f904a8cb13dc2cd921b253658072389e95f' into eclair-plus-aosp

* commit '77f77f904a8cb13dc2cd921b253658072389e95f':
  Add support for selecting the color bit depth and if the application used a depth buffer.
2009-08-25 12:48:30 -07:00
Android (Google) Code Review
85c5740ffa Merge change 22109 into eclair
* changes:
  Fix bug 1546445: Correct spelling errors in API - InstrumentationTestCase.injectInsrumentation - AndroidTestRunner.setInstrumentaiton
2009-08-25 12:47:11 -07:00
Android (Google) Code Review
00b7698795 Merge change 22231 into eclair
* changes:
  Add support for selecting the color bit depth and if the application used a depth buffer.
2009-08-25 12:41:37 -07:00
Cynthia Wong
8944c1633c am 4025dbd9: Merge change 22618 into eclair
Merge commit '4025dbd97e7e800e9a75f76664453bdb2971c132' into eclair-plus-aosp

* commit '4025dbd97e7e800e9a75f76664453bdb2971c132':
  Only try to sync to subscribedfeeds for google acounts.
2009-08-25 12:38:38 -07:00
Android (Google) Code Review
ee363676f9 Merge change 22618 into eclair
* changes:
  Only try to sync to subscribedfeeds for google acounts.
2009-08-25 12:35:55 -07:00
Jaikumar Ganesh
3beab35621 am 617b22dc: Merge change 22520 into eclair
Merge commit '617b22dc075bbf704421adf15f39388ec098b4fd' into eclair-plus-aosp

* commit '617b22dc075bbf704421adf15f39388ec098b4fd':
  Add local frames for parsing properties and processing events.
2009-08-25 12:09:54 -07:00
Android (Google) Code Review
fcea4d55f0 Merge change 22520 into eclair
* changes:
  Add local frames for parsing properties and processing events.
2009-08-25 12:07:53 -07:00
Fred Quintana
93277bff26 am 5fe00057: Merge change 22549 into eclair
Merge commit '5fe00057dd611fda30f44edb98771e38bf452ecd' into eclair-plus-aosp

* commit '5fe00057dd611fda30f44edb98771e38bf452ecd':
  - make it ok to modify the accounts before boot
2009-08-25 11:49:22 -07:00
Android (Google) Code Review
b7963dc029 Merge change 22549 into eclair
* changes:
  - make it ok to modify the accounts before boot - allow packages in the system image to access any authtokens they wish
2009-08-25 11:47:11 -07:00
Mike Reed
b83b9d7485 am dbade9d6: expose runtime changes to gamma
Merge commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b' into eclair-plus-aosp

* commit 'dbade9d6a075b1d5b8ebe10ee8961a5de296c93b':
  expose runtime changes to gamma
2009-08-25 10:58:07 -07:00
Yu Shan Emily Lau
0017620346 am 523018f1: am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit '523018f1828884e96b1265f3e347410280577945' into eclair-plus-aosp

* commit '523018f1828884e96b1265f3e347410280577945':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:44:04 -07:00
Yu Shan Emily Lau
479a38ab8d am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:42:02 -07:00
Amith Yamasani
4d26c12248 am 91ba1c3f: Merge change 22521 into eclair
Merge commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7' into eclair-plus-aosp

* commit '91ba1c3f9d000928a4ba12d45d609b1c2e7066e7':
  Revert volume if it wasn't okayed by user.
2009-08-25 10:25:20 -07:00
Android (Google) Code Review
e99a269ec4 Merge change 22521 into eclair
* changes:
  Revert volume if it wasn't okayed by user.
2009-08-25 10:23:29 -07:00
Karl Rosaen
45536d95ff am 678771b8: New strings and utlity method tweaks associated with updated account unlock screen flow.
Merge commit '678771b8118c3289aff6814775cbb30fa8aada29' into eclair-plus-aosp

* commit '678771b8118c3289aff6814775cbb30fa8aada29':
  New strings and utlity method tweaks associated with updated account unlock screen flow.
2009-08-25 09:32:52 -07:00
Chih-Chung Chang
e4262e7fd1 am 4804c3e2: Merge change 22564 into eclair
Merge commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8' into eclair-plus-aosp

* commit '4804c3e23b0bb8e77b690df177ebd4d6fb949aa8':
  Add an extra intent parameter for recording duration limit.
2009-08-24 23:58:32 -07:00
Android (Google) Code Review
8dd42efe9d Merge change 22564 into eclair
* changes:
  Add an extra intent parameter for recording duration limit.
2009-08-24 23:56:49 -07:00
Jeff Sharkey
bf567e2972 am f7eab4f7: Don\'t use deprecated API in contact header widget.
Merge commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea' into eclair-plus-aosp

* commit 'f7eab4f78fe4bdb193a4f8caf2648d2cb3ef36ea':
  Don't use deprecated API in contact header widget.
2009-08-24 22:09:24 -07:00
Mathias Agopian
281f6da601 am d6bfef36: Merge change 22563 into eclair
Merge commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45' into eclair-plus-aosp

* commit 'd6bfef3647162785bc3206c2d4e3e8ceba1dca45':
  fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
2009-08-24 21:50:00 -07:00
Android (Google) Code Review
fa15ca09e2 Merge change 22563 into eclair
* changes:
  fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once
2009-08-24 21:48:07 -07:00
Mathias Agopian
a69e0ed4a3 fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once 2009-08-24 21:47:13 -07:00
Guang Zhu
c2715c249a am 45e38f84: Merge change 22559 into eclair
Merge commit '45e38f84612eee82d53bf8be2776be79c7d8c015' into eclair-plus-aosp

* commit '45e38f84612eee82d53bf8be2776be79c7d8c015':
  Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
2009-08-24 21:04:18 -07:00
Android (Google) Code Review
7a94e61653 Merge change 22559 into eclair
* changes:
  Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works.
2009-08-24 21:03:20 -07:00
Dianne Hackborn
5d2f089073 am 0d05be3f: Merge change 22544 into eclair
Merge commit '0d05be3f724740eb95ac5acd9819b4db0eccd694' into eclair-plus-aosp

* commit '0d05be3f724740eb95ac5acd9819b4db0eccd694':
  Fix bug that would leave old windows around.
2009-08-24 20:23:11 -07:00
Android (Google) Code Review
a6fe7831cd Merge change 22544 into eclair
* changes:
  Fix bug that would leave old windows around.
2009-08-24 20:20:51 -07:00
Jackson Fan
1612290279 am 094f44ba: Merge change 22545 into eclair
Merge commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da' into eclair-plus-aosp

* commit '094f44ba6c8e70dc38a4f8d9ac5f20890e4477da':
  Use correct UUID to authorize AVRCP
2009-08-24 19:07:21 -07:00
Android (Google) Code Review
cd1ecc383c Merge change 22545 into eclair
* changes:
  Use correct UUID to authorize AVRCP
2009-08-24 19:05:06 -07:00
Dianne Hackborn
3e2209b1a1 am 07c82855: Merge change 22537 into eclair
Merge commit '07c8285599f99d5e512269fa68f0233ca8133073' into eclair-plus-aosp

* commit '07c8285599f99d5e512269fa68f0233ca8133073':
  Fix build.
2009-08-24 18:29:13 -07:00
Mathias Agopian
e75aa99a31 am 048d51b9: Merge change 22257 into eclair
Merge commit '048d51b9f51e646046b9a7ff5153723a27200138' into eclair-plus-aosp

* commit '048d51b9f51e646046b9a7ff5153723a27200138':
  first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec
2009-08-24 18:29:10 -07:00
Android (Google) Code Review
95b1ee391a Merge change 22537 into eclair
* changes:
  Fix build.
2009-08-24 18:27:55 -07:00
Android (Google) Code Review
ab48633d60 Merge change 22257 into eclair
* changes:
  first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec
2009-08-24 18:26:52 -07:00
Mike Lockwood
7b3f9724fa am 4358731c: Merge change 22534 into eclair
Merge commit '4358731c98929e2d5af70b0c4983a872386569bd' into eclair-plus-aosp

* commit '4358731c98929e2d5af70b0c4983a872386569bd':
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
2009-08-24 18:22:44 -07:00
Android (Google) Code Review
75000f666f Merge change 22534 into eclair
* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
2009-08-24 18:20:41 -07:00
Robert Greenwalt
951320c6fc am 0badd0b7: Note net availability even when apn not enabled
Merge commit '0badd0b700ed618dac421cb6cde4654b51acb3a4' into eclair-plus-aosp

* commit '0badd0b700ed618dac421cb6cde4654b51acb3a4':
  Note net availability even when apn not enabled
2009-08-24 17:47:01 -07:00
Dianne Hackborn
16627286d7 am 4a51c20c: I am getting tired of the java doc warnings, so fix them.
Merge commit '4a51c20ce607c74914f90fd897f04080121ac13b' into eclair-plus-aosp

* commit '4a51c20ce607c74914f90fd897f04080121ac13b':
  I am getting tired of the java doc warnings, so fix them.
2009-08-24 17:39:35 -07:00
Dianne Hackborn
43a9ebc343 am cf3a0830: Merge change 22400 into eclair
Merge commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f' into eclair-plus-aosp

* commit 'cf3a08307d1599eaa91d7cc4e7c601e5fa13037f':
  Add more control over a service's start state.
2009-08-24 17:04:01 -07:00
Android (Google) Code Review
6a595e4b30 Merge change 22400 into eclair
* changes:
  Add more control over a service's start state.
2009-08-24 17:01:50 -07:00
Robert Greenwalt
d2f3d6b34f am ec9fe467: Fix a race condition for data change notification
Merge commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4' into eclair-plus-aosp

* commit 'ec9fe4672a46eb928ab710d8e3caf2ce046100d4':
  Fix a race condition for data change notification
2009-08-24 16:39:35 -07:00
Mike Lockwood
0de8cfb1eb am 2e951b55: Merge change 22493 into eclair
Merge commit '2e951b5511750ebfbba28263ee5384bfa7f45128' into eclair-plus-aosp

* commit '2e951b5511750ebfbba28263ee5384bfa7f45128':
  Add resources to specify display rotation when in keyboard open or docked state.
2009-08-24 15:43:29 -07:00