373 Commits

Author SHA1 Message Date
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
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
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
Android (Google) Code Review
5c2f39af8d am 167dbe0b: Merge change 4670 into donut
Merge commit '167dbe0bf1f8d807d1ced400f146b7780eb6c721'

* commit '167dbe0bf1f8d807d1ced400f146b7780eb6c721':
  Update RandomBlock to use RandomAccessFile.  This helps
2009-06-18 17:07:29 -07:00
Android (Google) Code Review
167dbe0bf1 Merge change 4670 into donut
* changes:
  Update RandomBlock to use RandomAccessFile.  This helps prevent certain unusual conditions from corrupting the entropy file.  (for example, if Android should happen to crash while a write is in progress)
2009-06-18 17:05:19 -07:00
Android (Google) Code Review
e4839c4325 am 07eac016: Merge change 4682 into donut
Merge commit '07eac016446c63711bebe6e553e98c02d1fe55a5'

* commit '07eac016446c63711bebe6e553e98c02d1fe55a5':
  Store the app signatures as part of the backup set
2009-06-18 16:17:12 -07:00
Android (Google) Code Review
07eac01644 Merge change 4682 into donut
* changes:
  Store the app signatures as part of the backup set
2009-06-18 16:15:47 -07:00
Christopher Tate
6785dd8420 Store the app signatures as part of the backup set
Under a pseudo-app for the Package Manager, we store the app signatures for all
participating applications installed on the device.  At restore time we will
restore this first, then ensure that the current on-device signature chain is
compatible with the one in the backup set.  If there's a mismatch, this may be a
spoof attempt and we will refuse to restore that app's data.

The restore side of this is not implemented, but the Package Manager agent is
here as well as the backup side theoretically pushing the data now.
2009-06-18 15:58:25 -07:00
Nick Kralevich
2854254c2f Update RandomBlock to use RandomAccessFile. This helps
prevent certain unusual conditions from corrupting the
entropy file.  (for example, if Android should happen to
crash while a write is in progress)
2009-06-18 15:23:17 -07:00
Android (Google) Code Review
a791bc070f am 5ad76ef5: Merge change 4521 into donut
Merge commit '5ad76ef5ee1b437b4c07ed0be78ec7cc16c81dfe'

* commit '5ad76ef5ee1b437b4c07ed0be78ec7cc16c81dfe':
  load entropy data at boot.  Periodically write entropy data to disk.
2009-06-18 12:00:41 -07:00
Android (Google) Code Review
5ad76ef5ee Merge change 4521 into donut
* changes:
  load entropy data at boot.  Periodically write entropy data to disk.
2009-06-18 11:58:54 -07:00
Nick Kralevich
4fb256117c load entropy data at boot. Periodically write entropy data to disk. 2009-06-18 11:00:19 -07:00
Dianne Hackborn
abb01dba70 am c14b9ccd: Extend Intent/Uri conversion for use by Browser
Merge commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b'

* commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b':
  Extend Intent/Uri conversion for use by Browser
2009-06-17 22:45:54 -07:00
Android (Google) Code Review
cc4b106f73 am e64bb1dd: Merge change 4579 into donut
Merge commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c'

* commit 'e64bb1dd9ed68281af9968cf2cd23b4e49ead76c':
  Fix issue #1924851
2009-06-17 22:45:51 -07:00
Android (Google) Code Review
c0f088b06b am 3c2f8e66: Merge change 4456 into donut
Merge commit '3c2f8e6651178742bc685e7bd62fa8a6ca409a74'

* commit '3c2f8e6651178742bc685e7bd62fa8a6ca409a74':
  Replace the stub GoogleTransport with callout to the
2009-06-17 21:49:56 -07:00
Dianne Hackborn
c14b9ccdf1 Extend Intent/Uri conversion for use by Browser
This introduces a new Uri form of Intent with an "intent:" scheme, and a
corresponding update to the parser to handle these, so that the browser
can use this generic facility for starting activities based on the links
that are clicked and allow for web pages to link to arbitrary intents.

There is also a new "package" field on Intent which allows you to limit
the components it finds to a given package.  This replaces the new method
that was added to PackageManger for doing this when resolving activities,
and implements it for all Intent queries against the package manager.
2009-06-17 21:48:14 -07:00
Android (Google) Code Review
e64bb1dd9e Merge change 4579 into donut
* changes:
  Fix issue #1924851
2009-06-17 21:40:20 -07:00
Dianne Hackborn
760ec4a095 Fix issue #1924851
We now only increment the launch count when we are launching from one package
to another.  Also the individual components in a package now have a count
of the number of times they have been entered, which likewise is only updated
when going to one component from another.

This requires a new data format (all old data is wiped) and new checkin
dump format (tools must be updated to read it).
2009-06-17 21:36:52 -07:00
Android (Google) Code Review
2420186c89 am 5553f152: Merge change 3936 into donut
Merge commit '5553f1528e94377ae5adf423e91331f5eb57dd44'

* commit '5553f1528e94377ae5adf423e91331f5eb57dd44':
  add exception message to ApplicationErrorReport
2009-06-17 18:46:17 -07:00
Suchi Amalapurapu
e1fae30e20 Merge commit '0781df94' into manualmerge
Conflicts:
	Android.mk
	api/current.xml
2009-06-17 18:24:44 -07:00
Dan Egnor
87a02bcf68 Replace the stub GoogleTransport with callout to the
GoogleTransportService (which lives in vendor/google).
Use the Google transport by default.
Also, fix a bug: Thread.run() != Thread.start()
2009-06-17 18:23:05 -07:00
Android (Google) Code Review
5cc37854d4 am 07ca8c71: Merge change 4438 into donut
Merge commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48'

* commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48':
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 15:39:06 -07:00
Christopher Tate
1bd88ca88f am aa088447: Hold the current transport instantiated all the time.
Merge commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc'

* commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc':
  Hold the current transport instantiated all the time.
2009-06-17 15:37:53 -07:00
Jacek Surazski
f829a78f6c add exception message to ApplicationErrorReport
useful signal for clustering
2009-06-17 21:48:17 +02: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
Christopher Tate
ff4a203c78 am 63d27000: Allow privileged callers to schedule a backup pass for any app.
Merge commit '63d2700036d0f73cbde27f0fa724d30045b4bb07'

* commit '63d2700036d0f73cbde27f0fa724d30045b4bb07':
  Allow privileged callers to schedule a backup pass for any app.
2009-06-17 10:48:22 -07:00
Android (Google) Code Review
07ca8c71f4 Merge change 4438 into donut
* changes:
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 10:38:44 -07:00
Dianne Hackborn
82f3f0008e Fix many of the ANRs introduced by scheduling classes.
We weren't bumping the oom_adj of processes receiving a registered broadcast.  Previously
this wasn't a problem, because those processes are allowed to have their oom_adj
managed by whatever else is in them and if the registered receiver goes away no problem.
But now this is also controlling the scheduling class, so we need to bump them up.

This is probably good anyway, since the developer has the same assurance of their process
not being killing in the middle of registered receivers like it had always been for
manifest receivers.

Also fixed a small issue where we were not recomputing the oom_adh after finished with
a broadcast.
2009-06-16 18:49:05 -07:00
Christopher Tate
aa088447ba Hold the current transport instantiated all the time.
We no longer instantiate the transport just for the duration of handling a
backup or restore operation.  Instead, we hold the object forever (replacing it
if instructed to do so).  This makes it easier for transports to watch system
state and help set backup timing policy.

Also fixes up the IBackupTransport documentation a bit.
2009-06-16 18:25:46 -07:00
Christopher Tate
63d2700036 Allow privileged callers to schedule a backup pass for any app. 2009-06-16 17:18:05 -07:00
Android (Google) Code Review
714000456b am febde5fc: Merge change 4389 into donut
Merge commit 'febde5fc290eb422f78b47f393dc451394751d59'

* commit 'febde5fc290eb422f78b47f393dc451394751d59':
  More bmgr work; fix clear-data signalling
2009-06-16 16:43:17 -07:00
Christopher Tate
f68eb500f9 More bmgr work; fix clear-data signalling
The 'list sets' and 'restore token#' commands from bmgr now do what they are
supposed to.  At this point we see the restore target's data being cleared
properly and its agent being launched and invoked for restore.
2009-06-16 13:58:17 -07:00
Android (Google) Code Review
22a9f7a52e am 6297cb2e: Merge change 4287 into donut
Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09'

* commit '6297cb2eb57c183e202744516a96b2dbbf204a09':
  Sketch out a 'bmgr' command line tool
2009-06-16 08:37:18 -07:00
Android (Google) Code Review
6297cb2eb5 Merge change 4287 into donut
* changes:
  Sketch out a 'bmgr' command line tool
2009-06-15 19:03:48 -07:00
Christopher Tate
ace7f094bf Sketch out a 'bmgr' command line tool
Not finished, but eventually will allow adb shell access to the Backup Manager
for testing purposes etc.
2009-06-15 18:07:25 -07:00
Dianne Hackborn
a2aaa9e38f resolved conflicts for merge of 6edb3487 to master 2009-06-15 17:17:49 -07:00
Dianne Hackborn
cfaef699e1 Implement permission test for activity, window, service manager.
This also includes some changes to the window manager permission checks.  Almost all of these
are to make it most testable (through an exception on a permission failure), though there is
one permission check that needed to be added: updateOrientationFromAppTokens().
2009-06-15 14:35:07 -07:00
Christopher Tate
daf701fa62 am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
  Fix some backup reader/writer issues; make local transport do backup
  Fix the jni initializer.
  Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
  Fix bug #1812041: activity manager crash with bad args.
  Journal backup requests so that they won't be lost in a crash
  Fix data connection issues.
2009-06-14 21:13:03 -07:00
Android (Google) Code Review
be3615bded Merge change 4112 into donut
* changes:
  Fix bug #1812041: activity manager crash with bad args.
2009-06-12 18:03:11 -07:00
Dianne Hackborn
75b038545e Fix bug #1812041: activity manager crash with bad args.
There was old code that would kill the system process in some cases when there
was a bad activity token.  This is really no longer used, except in a few
places where it allows apps to kill the system.  So just get rid of it and
make the world a better place.
2009-06-12 15:43:26 -07:00
Christopher Tate
cde87f45e0 Journal backup requests so that they won't be lost in a crash
When an application requests a backup via dataChanged(), we now journal that
fact on disk.  The journal persists and is only removed following a successful
backup pass.  When the backup manager is started at boot time, it looks for any
existing journal files and schedules a backup for the apps listed in them, on
the expectation that the device shut down or crashed before a backup could be
performed.
2009-06-12 13:57:39 -07:00
Christopher Tate
0c32f14ef1 am 9bbc21a7: Flesh out restore interface on manager; work up most of LocalTransport
Merge commit '9bbc21a773cbdfbef2876a75c32bda5839647751'

* commit '9bbc21a773cbdfbef2876a75c32bda5839647751':
  Flesh out restore interface on manager; work up most of LocalTransport
2009-06-11 00:56:29 -07:00
Android (Google) Code Review
74c2acee04 am 238bf47a: Merge change 3826 into donut
Merge commit '238bf47a850532233ed51362dca95facf8680770'

* commit '238bf47a850532233ed51362dca95facf8680770':
  LocationManagerService: Fix logic error removing multiple dead receivers.
2009-06-11 00:45:02 -07:00
Christopher Tate
9bbc21a773 Flesh out restore interface on manager; work up most of LocalTransport 2009-06-10 20:38:54 -07:00
Android (Google) Code Review
de115412d5 Merge change 3841
* changes:
  Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89
2009-06-10 18:06:18 -07:00
Eric Fischer
f40e1a5fa6 Fix botched merge from commit b61498d1ac8e25f0024dcde46b41bcf0d8336d89 2009-06-10 18:02:15 -07:00
Android (Google) Code Review
238bf47a85 Merge change 3826 into donut
* changes:
  LocationManagerService: Fix logic error removing multiple dead receivers.
2009-06-10 17:32:21 -07:00
Simon Schoar
4686657cee LocationManagerService: Fix logic error removing multiple dead receivers.
If multiple receivers are dead, only the first one will be added.
found in http://code.google.com/p/android/issues/detail?id=2651

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-10 20:23:31 -04:00
Christopher Tate
bb8d0dfed9 am c7b31e3c: The rest of the basic flow for restore
Merge commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5'

* commit 'c7b31e3c3cd71129557d4bf9e3fbcebb9235aba5':
  The rest of the basic flow for restore
2009-06-10 17:19:57 -07:00