3758 Commits

Author SHA1 Message Date
Android (Google) Code Review
ba6409f1f6 Merge change 4706 into donut
* changes:
  Add a new checkin server flag for Vending Machine heartbeats.
2009-06-19 11:50:22 -07:00
Dianne Hackborn
c13713519d am 3d74bb4a: Add "why?" button to low battery dialog.
Merge commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672'

* commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672':
  Add "why?" button to low battery dialog.
2009-06-19 11:49:27 -07:00
Dianne Hackborn
3d74bb4ab2 Add "why?" button to low battery dialog.
This takes the user to the power usage activity.
2009-06-19 11:46:58 -07:00
Android (Google) Code Review
36adccf74f Merge change 4550
* changes:
  add a checkin eventlog tag for reporting GTalk heartbeat timeout; remove unused adaptive heartbeat settings.
2009-06-19 11:40:46 -07:00
Dianne Hackborn
d97c7adfc2 Fix issue #1753079: running instrumentation in shared processes.
The check for allowing the start of an activity was broken, it was
comparing the process of that activity's application vs. the current
instrumentation target package name.  Okay it was utterly insane.

Now this check is that the target activity will be running in the
same process as the instrumentation, which is really what we want.
2009-06-19 11:37:35 -07:00
Android (Google) Code Review
530b7125fa am 03255de3: Merge change 4757 into donut
Merge commit '03255de32d127d17504b6d475e6e79190dd637f8'

* commit '03255de32d127d17504b6d475e6e79190dd637f8':
  Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:31:37 -07:00
Android (Google) Code Review
03255de32d Merge change 4757 into donut
* changes:
  Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
2009-06-19 11:29:57 -07:00
Android (Google) Code Review
bd9ae1c254 am 697f9caf: Merge change 4687 into donut
Merge commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f'

* commit '697f9caf8b63fa87ecfeb9a29aa129ba5321641f':
  Use standalone month name instead of format month name in year-month format.
2009-06-19 10:38:51 -07:00
Android (Google) Code Review
6976dca6c8 am 6afe8133: Merge change 4720 into donut
Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'

* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:38:47 -07:00
Suchi Amalapurapu
c73e9ad55a am bc806f65: Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
Merge commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90'

* commit 'bc806f65edc33f6eda0f475ac84e5e037a013a90':
  Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage.
2009-06-19 10:38:45 -07:00
Android (Google) Code Review
697f9caf8b Merge change 4687 into donut
* changes:
  Use standalone month name instead of format month name in year-month format.
2009-06-19 10:30:15 -07:00
Android (Google) Code Review
6afe81339e Merge change 4720 into donut
* changes:
  Fix string formatters in SettingsProvider SecurityException message.
2009-06-19 10:29:59 -07:00
Suchi Amalapurapu
bc806f65ed Remove deprecated api. Aptly rename freeStorageWithIntent to freeStorage. 2009-06-19 10:25:37 -07:00
Android (Google) Code Review
903ccf479f am 2b1aed10: Merge change 4527 into donut
Merge commit '2b1aed1021fb472de83c4c0143f2c4452244a0af'

* commit '2b1aed1021fb472de83c4c0143f2c4452244a0af':
  Fix Canvas.finalize() for the case where the constructor throws an exception
2009-06-19 10:09:00 -07:00
Nick Pelly
6c901db72d Add getBatteryUsageHint() to BluetoothHeadset for power monitoring.
This is a monotonically increasing integer. Wraps to 0 at
Integer.MAX_INT, and at boot.
Current implementation returns the number of AT commands handled since
boot. This is a good indicator for spammy headset/handsfree units that
can keep the device awake by polling for cellular status updates. As a
rule of thumb, each AT command prevents the CPU from sleeping for 500 ms
2009-06-19 10:08:09 -07:00
Android (Google) Code Review
2b1aed1021 Merge change 4527 into donut
* changes:
  Fix Canvas.finalize() for the case where the constructor throws an exception before the native canvas instance was created.
2009-06-19 10:07:29 -07:00
Brett Chabot
31a88fac91 Fix string formatters in SettingsProvider SecurityException message. 2009-06-19 09:45:48 -07:00
Wu-cheng Li
1e3fc65b1f am 649f99e8: Add Intent.ACTION_SEND_MULTIPLE
Merge commit '649f99e8347984c1e031dae302830f4c9ebd3df4'

* commit '649f99e8347984c1e031dae302830f4c9ebd3df4':
  Add Intent.ACTION_SEND_MULTIPLE
2009-06-19 03:55:09 -07:00
Wu-cheng Li
649f99e834 Add Intent.ACTION_SEND_MULTIPLE
Activities can use this intent to send multiple data.
2009-06-19 18:48:37 +08:00
Android (Google) Code Review
cc9baea938 Merge change 4621
* changes:
  Update WebStorage methods used by DumpRenderTree to complete synchronously if they are called on the webcore thread.
2009-06-19 02:09:28 -07:00
Chia-chi Yeh
4df90a869c gsm: Remove PppLink since pppd_gprs service does not exist. 2009-06-19 16:02:30 +08:00
Android (Google) Code Review
061c3b5058 am fd5f0875: Merge change 4721 into donut
Merge commit 'fd5f087536dcb04ac9c46f2b19f87a37455390b0'

* commit 'fd5f087536dcb04ac9c46f2b19f87a37455390b0':
  Make signature checks on restore work with unsigned apps
2009-06-18 20:51:09 -07:00
Android (Google) Code Review
fd5f087536 Merge change 4721 into donut
* changes:
  Make signature checks on restore work with unsigned apps
2009-06-18 20:49:06 -07:00
Android (Google) Code Review
ba165caf44 am e0b7e916: Merge change 4679 into donut
Merge commit 'e0b7e916a1259d2dd9c116695607f9877ec56056'

* commit 'e0b7e916a1259d2dd9c116695607f9877ec56056':
  Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:54:47 -07:00
Jason Sams
2d9c39d6e1 Fix two minor issues. Rename launchID to launchIndex and make util class Matrix public for apps to use. 2009-06-18 19:52:45 -07:00
Android (Google) Code Review
e0b7e916a1 Merge change 4679 into donut
* changes:
  Replace the dummy code with Keystore for <keygen> support.
2009-06-18 19:52:00 -07:00
Android (Google) Code Review
49eb3301c7 am c6282977: Merge change 4718 into donut
Merge commit 'c6282977180c220b1a68c23a328e7d75a11963ab'

* commit 'c6282977180c220b1a68c23a328e7d75a11963ab':
  Fix sim-eng build and simplify previous lcd-density related patch
2009-06-18 19:46:59 -07:00
Android (Google) Code Review
c628297718 Merge change 4718 into donut
* changes:
  Fix sim-eng build and simplify previous lcd-density related patch
2009-06-18 19:45:07 -07:00
Christopher Tate
20efdf6b56 Make signature checks on restore work with unsigned apps 2009-06-18 19:42:24 -07:00
David 'Digit' Turner
3c08a446c5 Fix sim-eng build and simplify previous lcd-density related patch 2009-06-19 04:41:12 +02:00
Android (Google) Code Review
8dbbe3b52f am 63e7155c: Merge change 4696 into donut
Merge commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d'

* commit '63e7155c7d1d0c3f0027400aa09e9a45f648a80d':
  Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:35:32 -07:00
Android (Google) Code Review
63e7155c7d Merge change 4696 into donut
* changes:
  Fix targetSdkVersion, make resize mode a flag, delayed dexopt, easy ApplicationInfo.
2009-06-18 19:33:33 -07:00
Android (Google) Code Review
f923ed6ff7 am 5502f04c: Merge change 4709 into donut
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707'

* commit '5502f04c1dcf2b1918858bacb99fb0480a711707':
  backup stuff
2009-06-18 19:04:56 -07:00
Android (Google) Code Review
1c14776a13 am 16ce3504: Merge change 4708 into donut
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'

* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
  Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:04:50 -07:00
Android (Google) Code Review
5502f04c1d Merge change 4709 into donut
* changes:
  backup stuff
2009-06-18 19:02:39 -07:00
Android (Google) Code Review
16ce3504c5 Merge change 4708 into donut
* changes:
  Make RestoreHelper and friends also write out the snapshot state.
2009-06-18 19:02:30 -07:00
Linda Nguyen
abd7eba70b Add a new checkin server flag for Vending Machine heartbeats. 2009-06-18 18:52:59 -07:00
Android (Google) Code Review
81a2a3931f am 568b62c8: Merge change 4702 into donut
Merge commit '568b62c861ed4abc792d517f61640610400614e1'

* commit '568b62c861ed4abc792d517f61640610400614e1':
  Fix bug 1927213 test failures.
2009-06-18 18:47:24 -07:00
Android (Google) Code Review
568b62c861 Merge change 4702 into donut
* changes:
  Fix bug 1927213 test failures.
2009-06-18 18:45:08 -07:00
Christopher Tate
610a0af4e3 am abce4e87: Use signatures on restore
Merge commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a'

* commit 'abce4e8714bed26a2b37b20ad3f02cf619d71c9a':
  Use signatures on restore
2009-06-18 18:42:02 -07:00
Joe Onorato
5d605dc56b backup stuff 2009-06-18 18:41:11 -07:00
Joe Onorato
d2d9ceb730 Make RestoreHelper and friends also write out the snapshot state. 2009-06-18 18:41:11 -07:00
Christopher Tate
abce4e8714 Use signatures on restore
On restore now, the backup manager gets the signature blocks corresponding to
the restore set from the transport.  It then validates those signatures against
the on-device app signatures, and refuses to restore data to an app whose
on-device sig block does not match the backup image's.

Also actually implement 'bmgr transport N' so that we can select the local
transport easily during runtime.
2009-06-18 18:38:02 -07:00
Dianne Hackborn
d7ed9175aa Fix bug 1927213 test failures.
Eat the security exception that is now thrown by the window manager to
retain the old behavior for tests.  (We still need to throw the
exception from the WM for the new permission tests.)
2009-06-18 18:36:37 -07:00
Android (Google) Code Review
6e9aa305d9 Merge change 4700
* changes:
  Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
2009-06-18 18:29:49 -07:00
Feng Qian
968706829f Merge commit 'goog/master-webkit-merge' into webkit-merge-44544 2009-06-18 17:52:33 -07:00
Android (Google) Code Review
64d4d8343f Merge change 4698
* changes:
  Fix bug in BluetoothInputStream.read().
2009-06-18 17:42:25 -07:00
Android (Google) Code Review
6be4025b12 am 2810f681: Merge change 4694 into donut
Merge commit '2810f681991d1beb5ceb3515159f9fad3cc341d5'

* commit '2810f681991d1beb5ceb3515159f9fad3cc341d5':
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:26:48 -07:00
Android (Google) Code Review
2810f68199 Merge change 4694 into donut
* changes:
  Make SettingsProviders SecurityException messages more verbose.
2009-06-18 17:24:47 -07:00
Android (Google) Code Review
0c7b07a003 Merge change 4692
* changes:
  Replace spins with proper pthread conditions.
2009-06-18 17:21:31 -07:00