2852 Commits

Author SHA1 Message Date
Android (Google) Code Review
a08ffc9189 Merge change 3479 into donut
* changes:
  Report device storage status (for SMS) to RIL.
2009-06-08 16:20:55 -07:00
jsh
52f2825c29 Report device storage status (for SMS) to RIL.
Indicate SMS memory available/not available based on DEVICE_STORAGE_OK/FULL
intents, and immediately NAK with MEMORY_FULL if we've received a
DEVICE_STORAGE_FULL notification.

This may end up being a short term solution, as the messaging app is
getting re-worked in Eclair, which may change the way we want to handle
memory full reporting (ie, more app involvement).
2009-06-08 16:05:00 -07:00
Christopher Tate
9b3905c4a2 Revamp IRestoreSession a bit
We now supply an array of RestoreSet objects instead of wacky Bundle
shenanigans.  Also, pushed beginRestoreSession() out to the BackupManager
concrete interface class so that SetupWizard can use it.

(beginRestoreSession() is @hide, non-privileged apps cannot use it.  It's
also guarded by android.permission.BACKUP enforcement.)
2009-06-08 16:01:24 -07:00
Android (Google) Code Review
f5b746e157 am b2df1699: Merge change 1548 into donut
Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194'

* commit 'b2df1699c996e62baa78877978cd2c5607ea4194':
  NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
2009-06-08 16:00:19 -07:00
Android (Google) Code Review
b2df1699c9 Merge change 1548 into donut
* changes:
  NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
2009-06-08 15:58:21 -07:00
Romain Guy
5519185292 resolved conflicts for merge of bad927 to master 2009-06-08 15:33:17 -07:00
Android (Google) Code Review
f87e896955 Merge change 3485
* changes:
  Fix build issue and ref count bug with scripts.
2009-06-08 15:22:58 -07:00
Jason Sams
3a833d8e0f Fix build issue and ref count bug with scripts. 2009-06-08 15:20:31 -07:00
Android (Google) Code Review
bad927a987 Merge change 3480 into donut
* changes:
  Do not automatically enable gestures in list based on filtering/fastscroll status. Enable gestures in Contacts for now.
2009-06-08 14:59:13 -07:00
Romain Guy
0a20264db8 Do not automatically enable gestures in list based on filtering/fastscroll status. Enable gestures in Contacts for now. 2009-06-08 14:47:01 -07:00
Ken Shirriff
793f0ffc23 resolved conflicts for merge of 410ea6 to master 2009-06-08 13:44:17 -07:00
Android (Google) Code Review
410ea66256 Merge change 3471 into donut
* changes:
  Fix contact creation.
2009-06-08 13:28:01 -07:00
Android (Google) Code Review
cf7903af3c am 996b1c8d: Merge change 3431 into donut
Merge commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111'

* commit '996b1c8d681268961a9e6518b9a5cbe98ccf0111':
  Moved error status from SpeechServiceRecognizerListener
2009-06-08 13:08:47 -07:00
Android (Google) Code Review
996b1c8d68 Merge change 3431 into donut
* changes:
  Moved error status from SpeechServiceRecognizerListener
2009-06-08 13:06:30 -07:00
Ken Shirriff
e7eb9662c3 Fix contact creation.
This was broken by my change 2934.
bug=1903820
2009-06-08 12:52:50 -07:00
Android (Google) Code Review
8c09399490 am bdf90a08: Merge change 3462 into donut
Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3'

* commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3':
  Capture the memory output before the playback and record start.
2009-06-08 11:59:12 -07:00
Android (Google) Code Review
bdf90a08a2 Merge change 3462 into donut
* changes:
  Capture the memory output before the playback and record start.
2009-06-08 11:56:53 -07:00
Yu Shan Emily Lau
32e959163f Capture the memory output before the playback and record start. 2009-06-08 11:29:55 -07:00
Robert Greenwalt
641fa6c602 am fa5c7e1d: Catch when a file resource (non values) added in an overlay.
Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'

* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
  Catch when a file resource (non values) added in an overlay.
2009-06-08 11:06:48 -07:00
Robert Greenwalt
fa5c7e1dfe Catch when a file resource (non values) added in an overlay.
File resources are assigned resource id's and if an overlay adds one
it renumbers things and breaks compatability.  Used to segfault
if you tried before, but now catches it and lets you know what file
caused the problem.
2009-06-08 09:10:29 -07:00
Jianhong Jiang
2bcda90c02 NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC). 2009-06-08 08:50:42 -07:00
Cary Clark
19436561c6 send click in browser when key is sent to unfocused text field
Also, set focusControllerActive state based on presence of
focus and cursor that wants key events.

Disable focusControllerActive when moved cursor wants key
events.

Remove unused recompute-focus code.
2009-06-08 11:02:06 -04:00
Leon Scroggins
1c7f8c56c8 Update the language from "focus".
Previously, many methods, variables, etc referred to the focus.
Now, they have been changed to refer to the cursor when
appropriate.  Some references were changed to the focusCandidate,
since they may apply to either the focus or the cursor, which
is a candidate for focus.  Also removed unneeded method
unblockFocus.  WebView will not work without a corresponding
change in external/webkit.
2009-06-08 10:14:32 -04:00
Mitsuru Oshima
409895e374 Moved error status from SpeechServiceRecognizerListener 2009-06-08 02:28:04 -07:00
Chung-yih Wang
8229048cff First version of the keystore service.
The keystore service is protected by the user 'keystore'. Only keystore
user/group can access the key content. All users are able to do the
following commands from shell as well:
  listcerts
  listuserkeys
  installcert
  removecert
  installuserkey
  removeuserkey
2009-06-08 16:34:54 +08:00
Android (Google) Code Review
7699318ecd am 1e3d1b4b: Merge change 3107 into donut
Merge commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7'

* commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7':
  Motorola changes from 090602 through 090605
2009-06-07 22:49:49 -07:00
Android (Google) Code Review
1e3d1b4b83 Merge change 3107 into donut
* changes:
  Motorola changes from 090602 through 090605
2009-06-07 22:48:29 -07:00
Android (Google) Code Review
8bb61e6835 am 58c24412: Merge change 3422 into donut
Merge commit '58c244125fc2d2067bf89e67a154f6ca2421fe36'

* commit '58c244125fc2d2067bf89e67a154f6ca2421fe36':
  Check AirplaneMode when enabling Bluetooth has finished.
2009-06-07 21:44:06 -07:00
Android (Google) Code Review
58c244125f Merge change 3422 into donut
* changes:
  Check AirplaneMode when enabling Bluetooth has finished.
2009-06-07 21:42:14 -07:00
Android (Google) Code Review
40dabea7d8 am 9d9953d9: Merge change 3420 into donut
Merge commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c'

* commit '9d9953d94de4d17722ba2c768b92bd4ebeec908c':
  LocationManagerService: Remove some unneeded imports.
2009-06-07 21:04:43 -07:00
Christopher Tate
bd235f10a9 am 8c850b79: Add IRestoreSession interface for the restore flow
Merge commit '8c850b792f2d371fd8a4aff146d9d757ee982539'

* commit '8c850b792f2d371fd8a4aff146d9d757ee982539':
  Add IRestoreSession interface for the restore flow
2009-06-07 21:04:39 -07:00
Daisuke Miyakawa
5c43f735d9 Check AirplaneMode when enabling Bluetooth has finished.
This is part of manual merge from cupcake_dcm to donut.
Should be reviewed by mchan and takaoka.
Original internal CL: 149471-p9
2009-06-08 12:57:55 +09:00
Android (Google) Code Review
9d9953d94d Merge change 3420 into donut
* changes:
  LocationManagerService: Remove some unneeded imports.
2009-06-07 20:30:45 -07:00
Mike Lockwood
6ba283f726 LocationManagerService: Remove some unneeded imports.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-07 23:29:25 -04:00
Christopher Tate
8c850b792f Add IRestoreSession interface for the restore flow
Restore is a fairly complicated, somewhat stateful process, so we introduce
a new interface to encapsulate the various bits and pieces into a nicely
separable component.  In particular, this will make it much cleaner to
open and interrogate an expensive-to-construct transport and then reuse it
for the actual restore process itself.
2009-06-07 19:33:20 -07:00
Christopher Tate
53c31ed1ff am b4a6188a: Add rough-draft restore API set to IBackupTransport
Merge commit 'b4a6188a74273611abcae05f3a3b1f0547548301'

* commit 'b4a6188a74273611abcae05f3a3b1f0547548301':
  Add rough-draft restore API set to IBackupTransport
2009-06-07 15:35:14 -07:00
Christopher Tate
b4a6188a74 Add rough-draft restore API set to IBackupTransport
* getAvailableBackups returns the list of backup sets available for restore

* getAppSet() returns the set of apps available from a given backup set

* getRestoreData() streams the full backup data for a given application
(within a given backup set) into a FD; that data will be handed to the
app's backup agent for processing.
2009-06-07 15:30:44 -07:00
Android (Google) Code Review
4dde34b2f0 am da55569b: Merge change 3417 into donut
Merge commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3'

* commit 'da55569b0aaf98ff4d472d85ae1b038e76e1e9c3':
  Adjust IBackupTransport interface
2009-06-07 14:12:04 -07:00
Android (Google) Code Review
da55569b0a Merge change 3417 into donut
* changes:
  Adjust IBackupTransport interface
2009-06-07 14:10:31 -07:00
Christopher Tate
7b88128e08 Adjust IBackupTransport interface
Instead of just passing a package name to performBackup, pass the whole
PackageInfo struct, explicitly including the list of signatures for the package.
No need to make each transport look this up individually when it's a necessary
part of the backup payload for each app.
2009-06-07 13:55:42 -07:00
Guang Zhu
c71f084ff9 am 7757656a: Changed logic to handle timeout pages.
Merge commit '7757656a11ba7050274c337fd2dc2f18f9e7806f'

* commit '7757656a11ba7050274c337fd2dc2f18f9e7806f':
  Changed logic to handle timeout pages.
2009-06-07 13:47:45 -07:00
Guang Zhu
7757656a11 Changed logic to handle timeout pages. 2009-06-07 13:12:20 -07:00
Wink Saville
22ccaf5321 Motorola changes from 090602 through 090605
The changes from 090602 update frameworks/base to support 3way calling
and call waiting.

The changes from 090603 completed the CdmaInformationRecords class
but the original changes submitted has been simplified, toString added
and a bug fixed where the notifications where not being handled properly.

The changes from 090605 added Prl Version, apn fixes.
2009-06-07 12:09:18 -07:00
Android (Google) Code Review
36d3ebb880 am 19cd309f: Merge change 3017 into donut
Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3'

* commit '19cd309f9eccdf8454dc6e5076013588b7a170a3':
  Add the EAP related fields for WiFi configuration.
2009-06-05 21:18:02 -07:00
Christopher Tate
a31fb7d1d2 am 6fa95976: Apply OOM adjustment while an app is undergoing backup
Merge commit '6fa959769051f08655292ec47aa8480b248b67fd'

* commit '6fa959769051f08655292ec47aa8480b248b67fd':
  Apply OOM adjustment while an app is undergoing backup
2009-06-05 21:17:54 -07:00
Robert Greenwalt
5f0a472cd4 am 1aa8170e: Add per-named-item overlay ability in res xml.
Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707'

* commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707':
  Add per-named-item overlay ability in res xml.
2009-06-05 21:17:43 -07:00
Android (Google) Code Review
77a8658a91 am 5d16ac5e: Merge change 3374 into donut
Merge commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5'

* commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5':
  Fix tracking of backup participants across package remove/update
2009-06-05 21:17:36 -07:00
Android (Google) Code Review
ffa3ddfb70 am e3523054: Merge change 3356 into donut
Merge commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12'

* commit 'e3523054ded8c6e86935a978aa136c3ed2c0ba12':
  Cleaning up comments in interface for TTS engines.
2009-06-05 21:17:31 -07:00
Android (Google) Code Review
4bfa86011a am 4e0b13c9: Merge change 3348 into donut
Merge commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145'

* commit '4e0b13c9a94f2085d44d0fe36fd16e2599477145':
  Fix AlphabetIndexer.getSectionForPosition()
2009-06-05 21:17:24 -07:00
Android (Google) Code Review
7ab512096a am 327da854: Merge change 3344 into donut
Merge commit '327da854e8fbc444150b40941668b3c9187c34b9'

* commit '327da854e8fbc444150b40941668b3c9187c34b9':
  Updating TtsEngine.h and SynthProxy.cpp so that buffer memory
2009-06-05 21:17:19 -07:00