634 Commits

Author SHA1 Message Date
Dianne Hackborn
5d16cd0462 am d7cd29da: Add facility to run setup wizard after an update.
Merge commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1'

* commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1':
  Add facility to run setup wizard after an update.
2009-07-03 08:58:10 -07:00
The Android Open Source Project
575d1af980 resolved conflicts for merge of cf098294 to master 2009-07-03 08:55:59 -07:00
Android (Google) Code Review
7a91dc11ac am 2bbb80e1: Merge change 5994 into donut
Merge commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac'

* commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac':
  Less logging in some places.  More in others.
2009-07-03 08:18:22 -07:00
Romain Guy
28dda652a2 am a5475596: Cleanup a bunch of warnings in app widgets code.
Merge commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4'

* commit 'a54755962ca7725d1e2b6cacbbaece6f1cbf5af4':
  Cleanup a bunch of warnings in app widgets code.
2009-07-03 08:18:17 -07:00
Android (Google) Code Review
7e8cbfc2bc Merge change 6143 into donut
* changes:
  Fix the simulator.
2009-07-02 15:24:43 -07:00
Android (Google) Code Review
fc2459b80a am d18dc8c6: Merge change 5906 into donut
Merge commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe'

* commit 'd18dc8c641cb4c89ffb205fb510e59a40ddf43fe':
  resolve complex value in application context instead of system context.
2009-07-02 15:24:01 -07:00
Android (Google) Code Review
0d0012ef16 am 54af78a3: Merge change 5950 into donut
Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'

* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
  Fix memory leaks in system_server
2009-07-02 15:23:56 -07:00
Christopher Tate
1c502a4624 am 49401ddb: Revamp backup scheduling policy
Merge commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2'

* commit '49401ddb9ac11ad5caead4e4cefcaa81d2418ed2':
  Revamp backup scheduling policy
2009-07-02 15:23:49 -07:00
Christopher Tate
b0b659a8aa am ce0bf069: Use secure settings for backup enable / transport selection
Merge commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1'

* commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1':
  Use secure settings for backup enable / transport selection
2009-07-02 15:23:45 -07:00
Marco Nelissen
d595c79cdd Fix the simulator. 2009-07-02 15:23:26 -07:00
Android (Google) Code Review
e15df4017c Merge change 6132 into donut
* changes:
  If we can't get the restore set's metadata, don't continue
2009-07-02 14:30:56 -07:00
Christopher Tate
8c0324752a If we can't get the restore set's metadata, don't continue
Without the metadata we can't verify the version number or the signatures of the
apps whose data we'd be trying to restore against the apps present on device.
This is not acceptable; we need to refuse to give data to an unauthenticated
app.
2009-07-02 14:28:47 -07:00
Android (Google) Code Review
0d81f63687 Merge change 6102 into donut
* changes:
  Backup Wifi supplicant data.
2009-07-02 13:19:55 -07:00
Android (Google) Code Review
9701b3d594 Merge change 5979 into donut
* changes:
  Remove the constraint to assign new uid when code path changes for system packages
2009-07-02 12:20:29 -07:00
Christopher Tate
4e3e50cfa7 Clean up the last two literal permission string usages 2009-07-02 12:14:05 -07:00
Amith Yamasani
16d79e56ca Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
2009-07-02 12:05:32 -07:00
Christopher Tate
ee0e78af5a Add a "clear backed-up data" method to the backup mechanism
It's now possible to ask that the backup manager wipe the saved data for a given
application from the backing store.  LocalTransport implements this now but the
Google backend does not yet.  When the data is wiped, the on-device backup state
is also wiped to ensure that the next backup pushes all necessary data.

Bmgr has not yet been modified to actually call into this method, but it will
be soon.
2009-07-02 11:30:29 -07:00
Android (Google) Code Review
f73a65c2d7 am 65363830: Merge change 5854 into donut
Merge commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e'

* commit '65363830c1e5ca8c59b6e12b4b43a3f03688ca2e':
  Run backups at background priority
2009-07-01 22:44:37 -07:00
Android (Google) Code Review
d96e0b0cf1 am 6e1647a2: Merge change 5829 into donut
Merge commit '6e1647a212317f4ee8bcc23948b6621a59172954'

* commit '6e1647a212317f4ee8bcc23948b6621a59172954':
  Fix issue #1673793: Theme styles don't apply.
2009-07-01 22:43:58 -07:00
Dianne Hackborn
8ec5b83fc8 Merge commit '1dac277f' into manualmerge
Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java
2009-07-01 21:19:35 -07:00
Dianne Hackborn
d7cd29da91 Add facility to run setup wizard after an update.
The system now keeps a tag of the last version (just an arbitrary string)
that the setup wizard was run for.  If this is different than the current
one in the setup wizard, then setup is launched at boot.

This introduces a new intent action for the part of the setup wizard that
gets run for an ungrade, which the system uses to find its current version
tag for comparing against what was last stored.  It is up to the launched
setup activity update the stored setting to reflect its current value,
once it is happy.
2009-07-01 20:20:47 -07:00
Dianne Hackborn
cf098294da Move backup state to settings, change permission checks to use symbol.
This changes the backup service to use the settings provider instead
of system properties, correspondingly making it off by default and
allowing specific devices to define the transport.  Also tweaks
the permission checks to use the permission symbol instead of raw
strings.

This requires some corresponding changes in the vendor projects.
2009-07-01 20:12:36 -07:00
Android (Google) Code Review
2bbb80e183 Merge change 5994 into donut
* changes:
  Less logging in some places.  More in others.
2009-07-01 18:04:40 -07:00
Joe Onorato
9a5e3e115f Less logging in some places. More in others. 2009-07-01 21:04:03 -04:00
Romain Guy
a54755962c Cleanup a bunch of warnings in app widgets code. 2009-07-01 17:21:12 -07:00
Suchi Amalapurapu
b24a96701a Remove the constraint to assign new uid when code path changes for system packages 2009-07-01 16:16:56 -07:00
Christopher Tate
3b0b1a11d6 am 72d19aa5: Tighten up the metadata backup logic
Merge commit '72d19aa51e90d45c7895629db78e548da2f6d469'

* commit '72d19aa51e90d45c7895629db78e548da2f6d469':
  Tighten up the metadata backup logic
2009-07-01 16:01:48 -07:00
Android (Google) Code Review
d18dc8c641 Merge change 5906 into donut
* changes:
  resolve complex value in application context instead of system context.
2009-07-01 12:53:04 -07:00
Android (Google) Code Review
54af78a3f7 Merge change 5950 into donut
* changes:
  Fix memory leaks in system_server unlink DeathRecipients in a whole bunch of places to avoid memory leaks
2009-07-01 12:52:39 -07:00
Suchi Amalapurapu
fff2fda019 Fix memory leaks in system_server
unlink DeathRecipients in a whole bunch of places to avoid memory leaks
2009-07-01 12:55:30 -07:00
Christopher Tate
49401ddb9a Revamp backup scheduling policy
We now schedule a periodic check of pending backups; if any apps have requested
a backup since the last check, we perform all of the pending backups.  The
periodic backup scheduling matches the enable/disable state of the backup
manager; while backups are disabled entirely there are no periodic wakeups.

The period is set here to one hour.  If an external caller (transport, the
'bmgr' command line tool, etc) requests an immediate backup pass, that is
performed and then the periodic backup check is rescheduled using that pass as
the starting point of a new interval.
2009-07-01 12:38:06 -07:00
Christopher Tate
ce0bf069fe Use secure settings for backup enable / transport selection 2009-07-01 11:45:57 -07:00
Christopher Tate
a2b2223817 am 6f317426: Don\'t issue a deletion for the global metadata backup
Merge commit '6f317426e49e73ef3e50d8839877504039cd2fca'

* commit '6f317426e49e73ef3e50d8839877504039cd2fca':
  Don't issue a deletion for the global metadata backup
2009-07-01 11:19:15 -07:00
Mitsuru Oshima
8f25c426b1 resolve complex value in application context instead of system context. 2009-07-01 00:10:43 -07:00
Android (Google) Code Review
01ecd7bcd1 am ab4748c6: Merge change 5694 into donut
Merge commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd'

* commit 'ab4748c62d106d9cbc27c88ccd3d2bbda8e451bd':
  Implement persistent enable/disable of the backup manager
2009-07-01 00:07:35 -07:00
Dianne Hackborn
6463ff2468 resolved conflicts for merge of 66c2942a to master 2009-06-30 16:52:32 -07:00
Christopher Tate
7958834e0e Run backups at background priority 2009-06-30 16:11:49 -07:00
Android (Google) Code Review
6e1647a212 Merge change 5829 into donut
* changes:
  Fix issue #1673793: Theme styles don't apply.
2009-06-30 14:04:55 -07:00
Dianne Hackborn
1dac277f93 Implement issue #1943927 (need notification in status bar when adb is active)
This is a little hacky -- we just assume that if adb is enabled and power
is connected through usb, then it is active.

The icons and text are temporary until final design is provided.
2009-06-30 13:40:51 -07:00
Dianne Hackborn
de7faf658c Fix issue #1673793: Theme styles don't apply.
It turns out this was not a problem in the resource code at all.  Rather,
the system process has a cache of pre-loaded attributes it uses to avoid
continually reloading things as it needs them.  Well it turns out this
cache wasn't flushed after a package was uninstalled or a configuration
changed, so you could re-install an app where you change its style resources
so its theme now points to one that is inconsistent in the cache.

This is mostly a problem for developers, where they continually install
new versions of an app where resources have changed.  This could possibly
show up when updating an app on a normal phone, although the problem would
eventually correct itself since this cache uses weak references.

Anyway, the cache is now reworked to be flushed appropriately.

This change also includes an update to aapt to be able to dump the
contents of bags in resources.
2009-06-30 13:27:30 -07:00
Christopher Tate
72d19aa51e Tighten up the metadata backup logic
We now store the app version codes and and global OS incremental version name in
the PM backup state and the actual backup record.  We then use that information
to trigger a re-backup of the metadata if the OS revision changes in any way, or
to back up single apps' metadata if we notice that they've been upgraded.
2009-06-30 12:52:54 -07:00
Christopher Tate
5e79e32357 am 91717497: Use system properties to track the current transport
Merge commit '9171749700853305f3e6abbcdbd9e02f3a71d459'

* commit '9171749700853305f3e6abbcdbd9e02f3a71d459':
  Use system properties to track the current transport
2009-06-29 20:20:20 -07:00
Christopher Tate
f9435d7521 am f7c886b4: Respect android:allowClearUserData=false during restore
Merge commit 'f7c886b4fe27cd9ab4a9991958ff931054556a24'

* commit 'f7c886b4fe27cd9ab4a9991958ff931054556a24':
  Respect android:allowClearUserData=false during restore
2009-06-29 20:17:47 -07:00
Android (Google) Code Review
ff35c1d787 am bd1e8aa5: Merge change 5569 into donut
Merge commit 'bd1e8aa502a6d9231e2a1399cee18debcf70b3d6'

* commit 'bd1e8aa502a6d9231e2a1399cee18debcf70b3d6':
  Trim some superfluous imports.
2009-06-29 20:17:42 -07:00
Christopher Tate
6f317426e4 Don't issue a deletion for the global metadata backup
We were accidentally submitting a deletion for the global metadata key in the
PM backup handling (it was falling into the usual "here's a package that we said
we'd backed up last time, but now it's no longer on device" code).  Don't do
that any more, i.e. actually keep the global metadata key in the backup set.
Oops.
2009-06-29 18:52:55 -07:00
Android (Google) Code Review
f6ff591dec am 72eb0aca: Merge change 5483 into donut
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'

* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
  Expand support for different screen sizes.
2009-06-29 16:37:17 -07:00
Dan Egnor
8c3fc63576 am 156411df: Use a long for restore token
Merge commit '156411df4627336b246db78cddca8248ed615b67'

* commit '156411df4627336b246db78cddca8248ed615b67':
  Use a long for restore token
2009-06-29 16:37:02 -07:00
Christopher Tate
f35b2f382c am 8a27f923: Don\'t crash in various ways when using backup services too early
Merge commit '8a27f923eb9dbbe3c2d0184e82d9f1a98f1e4cdc'

* commit '8a27f923eb9dbbe3c2d0184e82d9f1a98f1e4cdc':
  Don't crash in various ways when using backup services too early
2009-06-29 16:36:52 -07:00
Christopher Tate
6ef58a1509 Implement persistent enable/disable of the backup manager
Backup & restore is still enabled by default, but with the expectation that it
will be enabled during the course of the Setup Wizard or some other privileged
entity that has notified the user about the ramifications.  While disabled,
data-changed notices will still be collected, but no backup pass will be
scheduled.  When the backup manager is later enabled, any pending data-changed
notices will then be processed and the apps invoked for backup.
2009-06-29 15:33:27 -07:00
Android (Google) Code Review
66c2942a11 Merge change 5605 into donut
* changes:
  Fix issue #1943706 (Applying the monkey to GoogleVoice causes SecurityException)
2009-06-29 11:57:33 -07:00