62 Commits

Author SHA1 Message Date
Christopher Tate
0d8dc14256 am 7d562ec3: Add a new IRestoreObserver callback class to the restore process
Merge commit '7d562ec393d54dd9ef387c49d1283243bfdbd2b1'

* commit '7d562ec393d54dd9ef387c49d1283243bfdbd2b1':
  Add a new IRestoreObserver callback class to the restore process
2009-06-25 18:13:19 -07:00
Christopher Tate
7d562ec393 Add a new IRestoreObserver callback class to the restore process
The observer is told when restore begins how many packages are being restored.
It then gets an onUpdate() call telling it that the Nth package is now
undergoing restore.  Ultimately, its restoreFinished() callback is invoked,
passing a simple success/fail error code, to let it know that the restore
operation has concluded.
2009-06-25 18:09:28 -07:00
Suchi Amalapurapu
e1fae30e20 Merge commit '0781df94' into manualmerge
Conflicts:
	Android.mk
	api/current.xml
2009-06-17 18:24:44 -07:00
Suchi Amalapurapu
1ccac75e1f Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app
Create a new public IntentSender class that can be used by PackageManager instead.
This new class uses IIntentSender internally and can only be created by PendingIntent for now.
Provide a new getIntentSender api in PendingIntent to create an instance of this class.
Move IIntentSender and IIntentReceiver from android.app to android.content
Change imports of IIntentSender and IIntentReceiver to reflect the new package name
The PackageManager api has been named as freeStorageWithIntent and will be renamed as freeStorage
once the older api(which has been deprecated) will be removed shortly.
2009-06-17 11:31:26 -07:00
Android (Google) Code Review
a28547d03f am 0fb46683: Merge change 3880 into donut
Merge commit '0fb466836bb654524683152371ecc32142cdf5de'

* commit '0fb466836bb654524683152371ecc32142cdf5de':
  Run search dialog in the system process.
2009-06-15 02:09:25 -07:00
Bjorn Bringert
8d17f3f24b Run search dialog in the system process.
Fixes http://b/issue?id=1905863

This is needed to address two security issues with global search:
http://b/issue?id=1871088 (Apps can read content providers through GlobalSearch)
http://b/issue?id=1819627 (Apps can use GlobalSearch to launch arbirtrary intents)

This also fixes http://b/issue?id=1693153 (SearchManager.OnDismissListener
never gets called)

To fix the security issues, GlobalSearch also needs to require
a non-app permission to access its content provider and launch intents.
2009-06-15 09:05:26 +01:00
Android (Google) Code Review
e69ec574e6 am 732912a1: Merge change 3730 into donut
Merge commit '732912a103e985520dba9c022a40bc21b4c4ced5'

* commit '732912a103e985520dba9c022a40bc21b4c4ced5':
  Restructuring the TTS files so that it works as a Service
2009-06-10 16:31:23 -07:00
Charles Chen
f85aa5a4d4 Restructuring the TTS files so that it works as a Service 2009-06-10 13:31:09 -07:00
Jaikumar Ganesh
d5ac1ae36b Framework changes for bluez4.
Changes in the Bluetooth JNI calls and framework functions
for Bluez4.
2009-06-09 17:21:08 -07:00
Raphael
dc3c0627d5 am d8b51a2b: Fix broken makefile. Again. His twin brother was hiding.
Merge commit 'd8b51a2ba8ee82be81414c0e80158e82b2c361d9'

* commit 'd8b51a2ba8ee82be81414c0e80158e82b2c361d9':
  Fix broken makefile. Again. His twin brother was hiding.
2009-06-08 22:10:01 -07:00
Raphael
d8b51a2ba8 Fix broken makefile. Again. His twin brother was hiding. 2009-06-08 22:06:02 -07:00
Raphael
7989971197 am 9207b1e7: Fix the broken makefile.
Merge commit '9207b1e7c8ad4bbef3530d2b047bf6587f2988c4'

* commit '9207b1e7c8ad4bbef3530d2b047bf6587f2988c4':
  Fix the broken makefile.
2009-06-08 22:03:42 -07:00
Raphael
9207b1e7c8 Fix the broken makefile. 2009-06-08 21:58:06 -07:00
Hung-ying Tyan
d0e9ae0a3e am 55567efc: First-time check-in of the VPN APIs.
Merge commit '55567efca99de7242b118cf7bf13cc773b01941c'

* commit '55567efca99de7242b118cf7bf13cc773b01941c':
  First-time check-in of the VPN APIs.
2009-06-08 20:44:23 -07:00
Hung-ying Tyan
55567efca9 First-time check-in of the VPN APIs.
Patch Set 2:
- Fixed style issues raised by cywang.
Patch Set 3:
- Hide everything
- Make VpnProfile parcelable
Patch Set 4:
- Add license notice
2009-06-09 11:28:38 +08: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
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
ad6042aa23 am 181fafaf: Retool the backup process to use a new \'BackupAgent\' class
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1'

* commit '181fafaf48208978b8ba2022683ffa78aaeddde1':
  Retool the backup process to use a new 'BackupAgent' class
2009-05-31 19:44:35 -07:00
Christopher Tate
181fafaf48 Retool the backup process to use a new 'BackupAgent' class
Backups will be handled by launching the application in a special
mode under which no activities or services will be started, only
the BackupAgent subclass named in the app's android:backupAgent
manifest property.  This takes the place of the BackupService class
used earlier during development.

In the cases of *full* backup or restore, an application that does
not supply its own BackupAgent will be launched in a restricted
manner; in particular, it will be using the default Application
class rather than any manifest-declared one.  This ensures that the
app is not running any code that may try to manipulate its data
while the backup system reads/writes its data set.
2009-05-31 13:10:03 -07:00
Dirk Dougherty
22075a3b74 am 5b6a5cee: am 3f9de8b6: AI 149211: Doc updates for Android 1.5 SDK, r2. BUG=1790234
Merge commit '5b6a5cee4c48fd2ffc35f07ebe9f24eb53086b9a'

* commit '5b6a5cee4c48fd2ffc35f07ebe9f24eb53086b9a':
  AI 149211: Doc updates for Android 1.5 SDK, r2.
2009-05-22 16:08:05 -07:00
Dirk Dougherty
5b6a5cee4c am 3f9de8b6: AI 149211: Doc updates for Android 1.5 SDK, r2. BUG=1790234
Merge commit '3f9de8b6caa3fe9119b363c64e79d13bb72aec76' into donut

* commit '3f9de8b6caa3fe9119b363c64e79d13bb72aec76':
  AI 149211: Doc updates for Android 1.5 SDK, r2.
2009-05-22 16:05:59 -07:00
Dirk Dougherty
3f9de8b6ca AI 149211: Doc updates for Android 1.5 SDK, r2.
BUG=1790234

Automated import of CL 149211
2009-05-22 16:04:18 -07:00
Android (Google) Code Review
2ee6c4c3ab am 17af14d8: Merge change 2289 into donut
Merge commit '17af14d8133f99b5e886d830e92e38ba1da7cc2d'

* commit '17af14d8133f99b5e886d830e92e38ba1da7cc2d':
  Add AIDL files for the TTS service and the associated callback service (to signal synthesis completion).
2009-05-22 16:01:24 -07:00
Jean-Michel Trivi
2c0c2af2ea Add AIDL files for the TTS service and the associated callback service (to signal synthesis completion). 2009-05-22 11:45:26 -07:00
Android (Google) Code Review
9b1e1400df am 8c690ea9: Merge change 2182 into donut
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913'

* commit '8c690ea9976d644db3c96eddbbbd2d50eac56913':
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 09:42:38 -07:00
Mike Lockwood
fd6e5f0dda location: Replace ILocationCollector interface with new ILocationProvider method
This change replaces ILocationCollector with a more general mechanism that
passes locations received from a provider to all other providers.
The network location provider now uses this to implement the location collector.
In the future, this could be used to inject network locations to the GPS
as aiding data.

This change also removes the now obsolete permission INSTALL_LOCATION_COLLECTOR.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 11:28:20 -04:00
svetoslavganov
76879bc234 resolved conflicts w/ 75986cf9bc57ef11ad70f36fb77fbbf5d63af6ec merge.... 2009-05-15 00:44:45 -07:00
svetoslavganov
75986cf9bc Accessibility feature - framework changes (replacing 698, 699, 700, 701 and merging with the latest Donut) 2009-05-14 23:47:05 -07:00
Dianne Hackborn
7a13559501 merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Android (Google) Code Review
0477090ca3 am 7db4860: Merge change 845 into donut
Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38'

* commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38':
  Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
2009-05-01 23:25:28 -07:00
Dave Bort
a833cbbed0 Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
This will be used to revive android.util.Config.DEBUG.

Signed-off-by: Dave Bort <dbort@android.com>
2009-05-01 17:47:08 -07:00
Mike Lockwood
ac7a3de471 am 15e3d0f: location: Use ILocationProvider Binder interface for all loc
Merge commit '15e3d0f082d551f8819fbe4b0d502cc108627876'

* commit '15e3d0f082d551f8819fbe4b0d502cc108627876':
  location: Use ILocationProvider Binder interface for all location providers.
2009-05-01 05:26:44 -07:00
Mike Lockwood
15e3d0f082 location: Use ILocationProvider Binder interface for all location providers.
This change eliminates the LocationProviderImpl class which had been used
for location providers running in the system process.
Now the LocationProvider base class is only used to implement the
LocationManager.createProvider() method for retrieving provider information.
Added a new IGpsStatusProvider interface for providers that serve GPS status.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-01 08:24:47 -04:00
Christopher Tate
f8997690da am 487529a: First baby steps towards settings backup
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185'

* commit '487529a70cd1479ae8d6bbfb356be7e72542c185':
  First baby steps towards settings backup
2009-04-29 15:16:57 -07:00
Christopher Tate
487529a70c First baby steps towards settings backup
This change adds a sketched outline of the backup system architecture, with
all of the major pieces represented other than client-side helpers for
specific types of data.  IBackupManager and BackupService are public so that
we can write test apps against SDK-domain symbols from the outset.

What code exists in this change hasn't been tested and may crash.  It's the
beginnings of the real implementation but of course is barely begun.
2009-04-29 14:49:30 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Dirk Dougherty
abdc514bf3 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:28 -07:00
Dirk Dougherty
e90232b1da AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147054
2009-04-21 01:00:12 -07:00
Dirk Dougherty
2e2c9104b7 AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147058
2009-04-20 17:56:34 -07:00
Dirk Dougherty
b5a4c5a473 AI 147053: Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  BUG=1790234

Automated import of CL 147053
2009-04-20 17:54:52 -07:00
Brandon Ballinger
f1bb004cda AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Original author: brandonb

Automated import of CL 146615
2009-04-18 22:04:01 -07:00
Brandon Ballinger
3385e728d8 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Brandon Ballinger
181a44dd81 AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Automated import of CL 146613
2009-04-16 14:31:48 -07:00
Mike Lockwood
a55c321329 location: Move geocoding support from ILocationProvider to a new interface.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-15 11:17:37 -04:00
Mike Lockwood
c1e8aa4c44 AI 144664: am: CL 144663 Use Binder interfaces between NetworkLocationManager and LocationManagerService.
This fixes a hack that was added when NetworkLocationManager was moved out of the framework.
  This also lays the groundwork for supporting location providers outside of the system process.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144664
2009-04-06 10:52:24 -07:00
Mike Lockwood
e932f7f2a4 AI 144663: Use Binder interfaces between NetworkLocationManager and LocationManagerService.
This fixes a hack that was added when NetworkLocationManager was moved out of the framework.
  This also lays the groundwork for supporting location providers outside of the system process.
  BUG=1729031

Automated import of CL 144663
2009-04-06 10:51:26 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
John Wang
e91bc680b7 AI 143331: am: CL 143181 am: CL 142924 Support DCM specific MMI network service.
IExtendedNetworkService has 4 MMI service interface used by PhoneUtils to put DCM related nw service.
  void setMmiString(String number);
  CharSequence getMmiRunningText();
  CharSequence getUserMessage(CharSequence text);
  void clearMmiString();
  And the service is bind via "com.android.ussd.IExtendedNetworkService".
  Original author: johnwang
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143331
2009-03-27 18:24:06 -07:00