Commit Graph

6849 Commits

Author SHA1 Message Date
Jaikumar Ganesh
88ccc8fbfb 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
617b22dc07 Merge change 22520 into eclair
* changes:
  Add local frames for parsing properties and processing events.
2009-08-25 12:07:53 -07:00
Jaikumar Ganesh
6d56b530e1 Add local frames for parsing properties and processing events.
We were running out of local refs when there are lots of devices.
Instead of deleting every single local ref, create a local stack frame.
This operation is inexpensive so doesn't add a high overload and keeps
the code clean instead of deleting every single local ref.
2009-08-25 12:02:34 -07:00
Fred Quintana
ab3996f2c6 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
5fe00057dd 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
9bace91641 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
Mike Reed
dbade9d6a0 expose runtime changes to gamma 2009-08-25 13:47:47 -04:00
Yu Shan Emily Lau
2bfe8ffab5 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
523018f182 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
657bf5b751 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
91ba1c3f9d Merge change 22521 into eclair
* changes:
  Revert volume if it wasn't okayed by user.
2009-08-25 10:23:29 -07:00
Yu Shan Emily Lau
b56de7474d Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
This reverts commit 051d8d6692.
2009-08-25 10:21:31 -07:00
Karl Rosaen
1607782261 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
Karl Rosaen
678771b811 New strings and utlity method tweaks associated with updated account unlock screen flow.
- 'setPermanentlyLocked(false)' no longer automatically resets the pattern
- new string for "waiting to verify account" progress dialog
- new string for account unlock screen title when you aren't past the too many
attempts, but just hit the 'forgot pattern' button
2009-08-25 08:26:38 -07:00
Chih-Chung Chang
c607435cae 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
4804c3e23b 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
4ce07160ec 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
Jeff Sharkey
f7eab4f78f Don't use deprecated API in contact header widget.
Fixes http://b/2074981
2009-08-24 22:05:35 -07:00
Chih-Chung Chang
eb0098d8e8 Add an extra intent parameter for recording duration limit. 2009-08-25 12:59:54 +08:00
Mathias Agopian
e420f4a9bc 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
d6bfef3647 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
94263d7923 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
9320cf652d 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
45e38f8461 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
Guang Zhu
8e3a84cd2e Filter out worker tests from layout suite because merely disabling worker in webview settings no longer works. 2009-08-24 21:01:25 -07:00
Dianne Hackborn
d8a0f45898 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
0d05be3f72 Merge change 22544 into eclair
* changes:
  Fix bug that would leave old windows around.
2009-08-24 20:20:51 -07:00
Fred Quintana
7be5964e74 - make it ok to modify the accounts before boot
- allow packages in the system image to access any authtokens they wish
2009-08-24 19:35:52 -07:00
Jackson Fan
8e40bad232 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
094f44ba6c Merge change 22545 into eclair
* changes:
  Use correct UUID to authorize AVRCP
2009-08-24 19:05:06 -07:00
Jackson Fan
9abcf0982e Use correct UUID to authorize AVRCP 2009-08-24 19:02:58 -07:00
Dianne Hackborn
83360b3167 Fix bug that would leave old windows around.
The problem was instigated by another fix I made to keep
windows around while their tokens are animating or preparing to
animate.  This then hit an issue where if the window's process
died while its token was getting ready to animate, we would
immediately hide the token, and when we then went to start
the token animation we wouldn't do anything, leaving the old
dummy animation in place and not allowing it to run.

Now we clear the animation before hiding the token, to ensure
the dummy animation is gone at this point.

Change-Id: If83fadcce6815bc545c80fbdb82fe6972bbdf5ef
2009-08-24 18:43:32 -07:00
Dianne Hackborn
2fc6254638 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
014da08291 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
07c8285599 Merge change 22537 into eclair
* changes:
  Fix build.
2009-08-24 18:27:55 -07:00
Dianne Hackborn
e1a7ad23e0 Fix build.
Change-Id: I7a21bc2151fb2a9a1135f676b563f40609bc997b
2009-08-24 18:27:08 -07:00
Android (Google) Code Review
048d51b9f5 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
9e521c10b3 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
4358731c98 Merge change 22534 into eclair
* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
2009-08-24 18:20:41 -07:00
Mike Lockwood
7d6eb9a4b4 ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-24 18:12:51 -07:00
Robert Greenwalt
7a47b54f13 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
Robert Greenwalt
0badd0b700 Note net availability even when apn not enabled
Fixes a problem where mms apn was on when we lost the network (airplane mode) but mms was
off when airplane mode was turned off so it kept thinking we didn't have access and
future mms always failed.

bug: 2075145
2009-08-24 17:41:49 -07:00
Dianne Hackborn
964fd32a73 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
4a51c20ce6 I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
2009-08-24 17:37:32 -07:00
Amith Yamasani
9b4742cf25 Revert volume if it wasn't okayed by user.
During orientation changes or homing, the volume is reverted. Also,
during pause/resume, the original and modified values are remembered and
restored if the dialog was up.
2009-08-24 17:28:17 -07:00
Dianne Hackborn
2f4f63b501 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
cf3a08307d Merge change 22400 into eclair
* changes:
  Add more control over a service's start state.
2009-08-24 17:01:50 -07:00
Dianne Hackborn
f6f9f2d025 Add more control over a service's start state.
One of the problems I have been noticing is background services
sitting around running and using resources.  Some times this is
due to the app developer doing this when they shouldn't, but there
are also a number of issues with the current Service interaction
model that make it very difficult (or impossible) to avoid
getting services stuck in the started state.  This is a
change/enhancement to the Service API to try to address this.

The main change is that Service.onStart() has been deprecated,
replaced with a new Service.onStartCommand() that allows the
service to better control how the system should manage it.  The
key part here is a new result code returned by the function, telling
the system what it should do with the service afterwards:

- START_STICKY is basically the same as the previous behavior,
  where we usually leave the service running.  The only difference
  is that it if it gets restarted because its process is killed,
  onStartCommand() will be called on the new service with a null
  Intent instead of not being called at all.

- START_NOT_STICKY says that, upon returning to the system, if
  its process is killed with no remaining start commands to
  deliver, then the service will be stopped instead of restarted.
  This makes a lot more sense for services that are intended to
  only run while executing commands sent to them.

- START_REDELIVER_INTENT is like START_NOT_STICKY, except if
  the service's process is killed before it calls stopSelf()
  for a given intent, that intent will be re-delivered to it
  until it completes (unless after 4 or more tries it still
  can't complete, at which point we give up).

Change-Id: I978f5ca420d70023d1b5e7f97de639d09381f8ad
2009-08-24 17:00:54 -07:00
Robert Greenwalt
123d6f372f 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
Robert Greenwalt
ec9fe4672a Fix a race condition for data change notification
We could sometimes not be told about network state changes breaking subsequent mms access.
Turning on more logging too.

bug: 2069106
2009-08-24 16:19:42 -07:00