• Home
  • History
  • Annotate
  • only in /frameworks/base/packages/SettingsProvider/
History log of /frameworks/base/packages/SettingsProvider/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
2d43fabaf7c15ded1dcb463725754edfe41b42a1 12-Dec-2012 Amith Yamasani <yamasani@google.com> Don't update global table when upgrading secondary users' database.

Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
rc/com/android/providers/settings/DatabaseHelper.java
84e2756c0f3794c6efe5568a9d09101ba689fb39 07-Dec-2012 Jeff Brown <jeffbrown@google.com> Play a tone when wireless charging begins.

Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
13579ed3305bf89b41a9fa88e1347f0e0769d279 29-Nov-2012 Dianne Hackborn <hackbod@google.com> Cleaner initial boot.

This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.

Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
rc/com/android/providers/settings/DatabaseHelper.java
40e9f2922cae76ffcbc521481e5be8e80e8744ef 28-Nov-2012 Dianne Hackborn <hackbod@google.com> Quiet down a lot of logging.

Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
rc/com/android/providers/settings/SettingsProvider.java
051ab5c2e8635f32c7d6ef744dc4261db8610add 22-Oct-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I51415c91026c1ea461f1b1239a75ec999fd7fe0c
Auto-generated-cl: translation import
es/values-af/defaults.xml
es/values-am/defaults.xml
es/values-ar/defaults.xml
es/values-be/defaults.xml
es/values-bg/defaults.xml
es/values-ca/defaults.xml
es/values-cs/defaults.xml
es/values-da/defaults.xml
es/values-de/defaults.xml
es/values-el/defaults.xml
es/values-en-rGB/defaults.xml
es/values-es-rUS/defaults.xml
es/values-es/defaults.xml
es/values-et/defaults.xml
es/values-fa/defaults.xml
es/values-fi/defaults.xml
es/values-fr/defaults.xml
es/values-hi/defaults.xml
es/values-hr/defaults.xml
es/values-hu/defaults.xml
es/values-in/defaults.xml
es/values-it/defaults.xml
es/values-iw/defaults.xml
es/values-ja/defaults.xml
es/values-ko/defaults.xml
es/values-lt/defaults.xml
es/values-lv/defaults.xml
es/values-ms/defaults.xml
es/values-nb/defaults.xml
es/values-nl/defaults.xml
es/values-pl/defaults.xml
es/values-pt-rPT/defaults.xml
es/values-pt/defaults.xml
es/values-ro/defaults.xml
es/values-ru/defaults.xml
es/values-sk/defaults.xml
es/values-sl/defaults.xml
es/values-sr/defaults.xml
es/values-sv/defaults.xml
es/values-sw/defaults.xml
es/values-th/defaults.xml
es/values-tl/defaults.xml
es/values-tr/defaults.xml
es/values-uk/defaults.xml
es/values-vi/defaults.xml
es/values-zh-rCN/defaults.xml
es/values-zh-rTW/defaults.xml
es/values-zu/defaults.xml
ed108f3d125b0a4cc465057e3514caf781cdea19 18-Oct-2012 John Spurlock <jspurlock@google.com> Frameworks base: Promote dream setting defaults to config.

So that:
- the values can be shared (to fix assoc bug)
- the values can be customized in product overlays

Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
d488bc0ef494718e82a77b2e9433c2480e7383b0 09-Oct-2012 Christopher Tate <ctate@google.com> Defer wifi bounce following restore for 1 minute...

...to allow network-reliant restore actions by apps to get underway.

Bug 7304761

Change-Id: Ia1d2321ef86609588efbc7add043c24a12ec6a20
rc/com/android/providers/settings/SettingsBackupAgent.java
531c237b82a948ac6599ba472bb95e26f71006cf 08-Oct-2012 Amith Yamasani <yamasani@google.com> Add an upgrade step for settings moved to global.

For some reason, the original step didn't work for some testers. This re-applies the move, which
should be no-ops if the entries are already in the right table.

Bug: 7254629

Also moved a few more entries to the global initialization section. Otherwise they would write
into the wrong table.

Change-Id: Ic0f5c4e09680f5687d08dccf78063508b9c0584c
rc/com/android/providers/settings/DatabaseHelper.java
73755c95ff9a3ebef294be674091ac677599bf3f 06-Oct-2012 Christopher Tate <ctate@google.com> Merge "Fix settings restore" into jb-mr1-dev
3543beb255b30c294283270ede3fcf048dc71b02 05-Oct-2012 Christopher Tate <ctate@google.com> Fix settings restore

Now with more fix.

Bug 7249405

Change-Id: Ib8bc2e9c5b054054f4aaacf14af8d5a0d05d6e3a
rc/com/android/providers/settings/SettingsBackupAgent.java
d0f199308e5d040bf0a968114578d620fb6a9f61 05-Oct-2012 Christopher Tate <ctate@google.com> Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
61695ffcbccc6cca210e869eb3bc6e97127c2357 05-Oct-2012 Christopher Tate <ctate@google.com> Make sure settings writes are permission checked correctly

The last bit of undoing the earlier tangle around query results having
observers under the calling user's identity. We do *not* want to drop
calling identity in the call() processing; we want the table-based
permission checks at the point of the underlying db operations to be
performed against that identity.

Bug 7265610

Change-Id: Ie0c9331ebd0918262a0a32b5b03b876fc2a92ca3
rc/com/android/providers/settings/SettingsProvider.java
7f1c248e80c747663396c6112bd637b0ee558dcb 05-Oct-2012 John Spurlock <jspurlock@google.com> Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.

Existing primary users were never being marked as complete,
causing things that relied on this (e.g. showing the quick settings panel)
to break.

Bug:7282088
Change-Id: I9c8622f3cd0fb99a44477946d3db22fa2cbbc6fc
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
5067685ccf6c294a77a3e7f0577190600a0e6238 05-Oct-2012 Christopher Tate <ctate@google.com> Settings (and general) restore fixes

Pro tem, we ignore wifi configuration data when restoring system settings.
This is not ideal, but it *does* mean we do not bounce wifi off and on
again during the extended restore process, which in turn means we don't
interfere with things like the Play Store's download of applications.
We do continue to back up wifi configuration, and will start using that
data again when the new implementation that restores AP configurations
without having to bounce wifi comes to pass.

Also, this CL fixes a longstanding bug in BackupDataInput.skipEntityData()
that was being reproduced reliably once settings restore was skipping
the wifi-related entities in the restore stream.

Bug 7249405

Change-Id: I61520a9a116b66ebdf95734d09d9afd46406df01
rc/com/android/providers/settings/SettingsBackupAgent.java
34637e57fc5bce01029806a67cf0cc2ef049e13b 05-Oct-2012 Christopher Tate <ctate@google.com> Make sure to check write perms after rewriting destination table

The write-permission check must occur after any destination-table
rewriting, otherwise any application would be able to write to
any global setting, by supplying a fraudulent "system" namespace
in the uri, but with a key name that will be redirected to global.

Bug 7289965

Change-Id: I122098a64e40d14e00d3cb6608c50aeb74faf7ce
rc/com/android/providers/settings/SettingsProvider.java
35dd752238d3ce3b83e78eb4b00a85ea3d067088 04-Oct-2012 Christopher Tate <ctate@google.com> Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev
c221d2be7d2bf57373d43457b18483266f88f9a6 04-Oct-2012 Christopher Tate <ctate@google.com> Rewrite raw insert()s and some raw query()s of moved-to-global keys

The Settings put*() APIs fix up references via the old namespaces,
but the raw insert() interface didn't. Now it does. Also, when
possible we fix up direct query() operations on the old namespace
to point to the correct one. At present that is only done for
query() operations with Uris of the form

content://secure/adb_enabled

There is no rewriting done on queries of the form

content://secure WHERE name='adb_enabled'

since the app-supplied WHERE clause can be arbitrarily complex.

Bug 7267568

Change-Id: I5c8cecbea7f5b1da6247a53b1428d3effb0bbca5
rc/com/android/providers/settings/SettingsProvider.java
1a2fac3eeda031ac5f4c7d17c883d54af5661a66 04-Oct-2012 Christopher Tate <ctate@google.com> Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev
afccaa84c8d1b9aa45040ddeb0edd42ba80e80d6 04-Oct-2012 Christopher Tate <ctate@google.com> Use myUserId() only in registerContentObserver()

The reason for this is a bit subtle: we want to guarantee that
when a content observer is registered using the public API, it
is *always* bound to the host user's view of the data behind the
observed Uri, never the calling user's. Now, the reason it was
the calling user in the first place is that the Settings provider
(and potentially any singleton provider) needs the observers
underlying Cursors returned from query() to be tied to the caller's
user, not the provider's host user.

In order to accomplish that now that the public-facing behavior is
always tied to the host user, the concrete class that implements
the Cursor type handled by the Settings provider has been extended
with a new hidden API for setting a notification observer tied to
an arbitrary user; and then the provider explicitly downcasts the
query result's Cursor to that class in order to register the
notification observer. We can do this safely because this is platform
code; if we change the way that these underlying cursors are constructed,
we can just fix this point of call to follow along. If they get out
of sync in the future, the Settings provider will scream bloody
murder in the log and throw a crashing exception.

Bug 7231549

Change-Id: I0aaceebb8b4108c56f8b9964ca7f9e698ddd91c8
rc/com/android/providers/settings/SettingsProvider.java
55b02226c07f276e143f9da6f752963882fb60d5 03-Oct-2012 Eric Laurent <elaurent@google.com> fix settings data base upgrade for ringer mode

Ringer mode setting was moved from System to Global group
but a db upgrade cleanup step was missing.

Bug 7128886.

Change-Id: Id20994fe74575afa2b68154a620aa3c8807e8304
rc/com/android/providers/settings/DatabaseHelper.java
66488d64df8c3cf8722b8bf282398617cf3c0551 02-Oct-2012 Christopher Tate <ctate@google.com> Make settings backup/restore work in the new multi-user world

1) Properly handle restores of settings elements that have been migrated
to the new global namespace

1) Back up and restore the new global settings namespace

3) Make sure to back up / restore the global entity
ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED

Bug 7249405

Change-Id: Ibfa9930ea4d0e16c7635697e8c631b155e4c0cb2
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsProvider.java
6e2bee75cea415621165698fdd9ce857bbb8872e 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Migrate more System and Secure settings to Global.

Includes telephony, WindowManager, PackageManager, and debugging
settings. Update API to point towards moved values.

Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
b14288d4b13d7629f578c4854f5a14d4d9a06783 01-Oct-2012 Jim Miller <jaggies@google.com> Attempt to fix missing lock sounds

bug 7254629

Change-Id: I65eee674fe014a0e84d5ec20ead81abdec38f890
rc/com/android/providers/settings/DatabaseHelper.java
0ac1028b0dc8713296e2face40abe5451ecd479c 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Move bluetooth priorities from Secure to Global.

Bug: 7231171
Change-Id: I836fdc2cfb8d67f984b4715559b9e92d0dc41c95
rc/com/android/providers/settings/DatabaseHelper.java
625239a05401bbf18b04d9874cea3f82da7c29a1 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> Migrate more Secure settings to Global.

Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.

Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
bdfce2ec05a3e9ca6acd6711de6133e06f2446e6 27-Sep-2012 Jeff Sharkey <jsharkey@android.com> First step towards cleaning up Global settings.

Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
d33646008948db439ea8cde8dfc0188aced6436d 25-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge into jb-mr1-dev

Change-Id: Idf183be6a41ff37add5141a20e96d5190396d1a4
139748fd724b482e2c012a6ec44d1c5abc0c0e97 24-Sep-2012 Dianne Hackborn <hackbod@google.com> Fix issue #7215984: java.lang.RuntimeException: Unable to create...

...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
there is really no need to do so.
- Rework the settings provider client side cache code to not hold
locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users. We can't do one per
user, since the system property name space is limited with a fixed
size. And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
rc/com/android/providers/settings/SettingsProvider.java
5bcb55186ebda12d9e4308043898f7aa3ac5c952 24-Sep-2012 Doug Zongker <dougz@google.com> fix argument parser for global settings URLs

Make content://settings/global/setting_name URLs work like system and
secure URLs.

Bug: 7212535
Change-Id: I33e388a0cc80309453714eab726ce45b3f8fef73
rc/com/android/providers/settings/SettingsProvider.java
b7564454297ba1706670ccab0562cac6676d0a77 20-Sep-2012 Christopher Tate <ctate@google.com> Multiuser awareness in content observer infrastructure

Content observers are registered under the calling user's identity,
not under the provider host's identity (unless the caller is using
the new permissioned entry points that allow observers to be
registered for a different user's view of the data). The most important
implication of this is that when the settings provider is directly
queried, the Cursor returned to the app is wired for change notifications
based on that calling app's user.

Note that it is not possible to use query() / insert() to read/write
data for different users. All such manipulations should use the
standard get* / put* methods in Settings.*.

Bug 7122169

Change-Id: If5d9ec44927e5e56e4e7635438f4ef48a5430986
rc/com/android/providers/settings/SettingsProvider.java
89d5546d7fd3a3bb19820c42e8b4527013dd6545 19-Sep-2012 Jeff Brown <jeffbrown@google.com> Add support for remembering Wifi display devices.

Add a setting to globally disable Wifi display.

Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.

Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.

Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
c8459dc85e53a9275c89190b35f1da35cd996e46 18-Sep-2012 Christopher Tate <ctate@google.com> Settings provider needs to send notifications as itself

... and not as its ultimate caller, who may be a less-privileged
application. Fixes bug 7188309

Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
rc/com/android/providers/settings/SettingsProvider.java
16aa9736175f5bbe924a6e5587a2ca47c2dd702b 18-Sep-2012 Christopher Tate <ctate@google.com> Per-user content observer APIs

Callers with INTERACT_ACROSS_USERS_FULL permission can now observe content
for a given user's view (and can notify content uri changes targeted to a
specific user). An observer watching for UserHandle.USER_ALL will see all
notifications for the given uri across all users; similarly, a notifier
who specifies USER_ALL will broadcast the change to all observers across
all users.

The API handles both USER_ALL or USER_CURRENT, and explicitly forbids
any other "pseudouser" designations.

This CL also revs the Settings provider to notify with USER_ALL for
changes to global settings, and with only the affected user's handle
for all other changes.

Bug 7122169

Change-Id: I94248b11aa91d1beb0a36432e82fe5725bb1264f
rc/com/android/providers/settings/SettingsProvider.java
6f5a9a96523ecf97a9828a410dd1226df47ec4e6 15-Sep-2012 Christopher Tate <ctate@google.com> Fix default population of wifi settings

Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.

A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.

Also updated the namespace used to refer to wifi settings from the
Wifi Service. These changes are cosmetic, but they do eliminate a
number of runtime log messages.

Bug 7153671

Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
rc/com/android/providers/settings/DatabaseHelper.java
0dbc4108005445d241c5f6990000d25a09a8e00e 14-Sep-2012 Christopher Tate <ctate@google.com> Merge "Fix Settings writes to a different user" into jb-mr1-dev
78d2a66ac12e4c8f1303225514f573fb53af1dd9 14-Sep-2012 Christopher Tate <ctate@google.com> Fix Settings writes to a different user

Oops. Stacked bugs: first, the desired user handle was not properly
being passed from the call() entry point to the database operations;
then on top of that, the client-side cache management was still
looking in the local user's cache for the data, so a request to read
a different user's settings would return the local user's instead if
that key was already known to the local user's cache.

Reads and writes of a different user's settings are now uncached,
so they're relatively much slower. They're rare, however, so this
is not something to worry about unless we encounter a real world
case where it's a significant factor.

This CL also adds a bit of cross-user settings read/write testing
to the existing provider suite. These new tests caught both the
known wrong-user-write bug and discovered the client-side cache
bug, so yay.

Finally, the existing wholesale mutual-exclusion approach would
deadlock in certain circumstances due to the fact that the
settings database creation code might have to call out to the
Package Manager while populating the bookmark/shortcut table,
and the Package Manager would then call back into the settings
provider in the course of handling that request. The synchronization
regime has been significantly tightened up now: now the database
code [which is known to deal with concurrency itself] is allowed
to cope with multiple parallel openers of the same db; this
allows the settings provider to avoid calling out to other parts
of the system even implicitly while its internal lock is held.

Change-Id: Ib77d445b4a2ec658cc5c210830f6977c981f87ed
rc/com/android/providers/settings/SettingsProvider.java
59c5beec64af8ea20509998230b7b1de496702f6 13-Sep-2012 Christopher Tate <ctate@google.com> Settings db upgrade steps only apply to the owner user

Change-Id: Ib74b42bcc2554edf721199f31f563daa9fc227a2
rc/com/android/providers/settings/DatabaseHelper.java
27d91832235a061cf57a78643a4d34feda7c0070 13-Sep-2012 Svetoslav Ganov <svetoslavganov@google.com> Merge "Core accessibility settings should not be cleared on restore." into jb-mr1-dev
818d20459099ea75e9b8d27c341af482653847a1 13-Sep-2012 Svetoslav Ganov <svetoslavganov@google.com> Core accessibility settings should not be cleared on restore.

1. The core accessibility settings required for a blind user to use
the device should not be overwritten on restore. There could have
been enabled via a global gesture from setup wizard, hence the
user definitely needs them. Restoring disabled values for these
settings render the device useless unless sighted help is sought.

bug:7138401

Change-Id: Idc593889aa61fada65b0407623720517c827df53
rc/com/android/providers/settings/SettingsHelper.java
c868b645b46685574955eaff9f8d46d9262a3357 13-Sep-2012 Christopher Tate <ctate@google.com> Moved a few telephony settings from Secure to Global

Also tidy up the bookkeeping for a few settings that were earlier
moved to Global without the redirect tables being fixed up.

Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
4dc7a68dbeaa0edd8815b2105915753310d58343 11-Sep-2012 Christopher Tate <ctate@google.com> Set up default (random) Android IDs for all users

Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.

Bug 7132405

Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
rc/com/android/providers/settings/SettingsProvider.java
d5fe1479248fa597efc7ccb0b36df0b520bbc2a3 11-Sep-2012 Christopher Tate <ctate@google.com> Miscellaneous fixes for Settings

(1) It's okay to write literal null as a settings element value
(2) Properly convey the user handle in the put-for-user variant

Bug 7137201
Bug 7139826

Change-Id: I0ed77d65e8377f0e0580a2668f10b7167ad34928
rc/com/android/providers/settings/SettingsProvider.java
0a26696560461b7fc4ecbf9588c291d46d253bda 08-Sep-2012 Christopher Tate <ctate@google.com> Merge "Log all individual settings restored" into jb-mr1-dev
d71778804c2b0f30c3b7b63997273d54a53e58d7 08-Sep-2012 Christopher Tate <ctate@google.com> Log all individual settings restored

Trying to get a handle on bug 7129406

Change-Id: If436c7888f0a8565d83c03024c54ea6ec83e7955
rc/com/android/providers/settings/SettingsBackupAgent.java
4d8fc793f044cf2c857ac72ebe51641b8e6c413d 07-Sep-2012 rich cannings <richc@google.com> Move verification settings to Settings.Global

Move Settings.Secure.PACKAGE_VERIFIER_ENABLE,
Settings.Secure.PACKAGE_VERIFIER_TIMEOUT,
Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE to
Settings.Global.PACKAGE_VERIFIER_ENABLE,
Settings.Global.PACKAGE_VERIFIER_TIMEOUT,
Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE, respectively.

Bug: 7082362
Change-Id: I21fde031a330563891c0129132f3d6369ac5e7a5
rc/com/android/providers/settings/DatabaseHelper.java
9219874be99cc07660807cc5dc94b0d157ef8808 07-Sep-2012 Christopher Tate <ctate@google.com> Further fixup of migration to global settings

The Settings.System.STAY_ON_WHILE_PLUGGED element should have been
migrated to the global table, but wasn't. This CL does a couple of
things around dealing with this:

(1) Tidies up the migration tables outright, so that they correctly
reflect the intended final state

(2) Introduces the option of doing a key migration only if the element
has not yet been moved to the new table, to allow for safe retry-
-with-ignore. This will make it easy to make any future alterations
to the global vs per-user association of individual elements

(3) Migrates the STAY_ON_WHILE_PLUGGED element if it hasn't been already.

Bug 7126575

Change-Id: Ic5fa9ba45f11b09270bd5bc94c26fbbd84abc749
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
1a9c0dfdbbeba1bc498170be283394ba3e0e9752 07-Sep-2012 Christopher Tate <ctate@google.com> Mark all settings upgrade transactions as successful along the way

If you don't, then the upgrade gets rolled back by the open helper,
and Bad Stuff Happens.

Change-Id: I191263e5cceb21b96ef413d28e7ee00a924acfc2
rc/com/android/providers/settings/DatabaseHelper.java
a96798e4a548f5ec0e387b2cdd8d419378498ebd 07-Sep-2012 Christopher Tate <ctate@google.com> Don't use toArray() inappropriately

HashSet<String>.toArray() does not give you an array of strings.

Change-Id: I2053e714b12eab718aaf75d92bbc0625745b9932
rc/com/android/providers/settings/DatabaseHelper.java
1cf70bbf96930662cab0e699d70b62865766ff52 06-Aug-2012 Svetoslav Ganov <svetoslavganov@google.com> Screen magnification - feature - framework.

This change is the initial check in of the screen magnification
feature. This feature enables magnification of the screen via
global gestures (assuming it has been enabled from settings)
to allow a low vision user to efficiently use an Android device.

Interaction model:

1. Triple tap toggles permanent screen magnification which is magnifying
the area around the location of the triple tap. One can think of the
location of the triple tap as the center of the magnified viewport.
For example, a triple tap when not magnified would magnify the screen
and leave it in a magnified state. A triple tapping when magnified would
clear magnification and leave the screen in a not magnified state.

2. Triple tap and hold would magnify the screen if not magnified and enable
viewport dragging mode until the finger goes up. One can think of this
mode as a way to move the magnified viewport since the area around the
moving finger will be magnified to fit the screen. For example, if the
screen was not magnified and the user triple taps and holds the screen
would magnify and the viewport will follow the user's finger. When the
finger goes up the screen will clear zoom out. If the same user interaction
is performed when the screen is magnified, the viewport movement will
be the same but when the finger goes up the screen will stay magnified.
In other words, the initial magnified state is sticky.

3. Pinching with any number of additional fingers when viewport dragging
is enabled, i.e. the user triple tapped and holds, would adjust the
magnification scale which will become the current default magnification
scale. The next time the user magnifies the same magnification scale
would be used.

4. When in a permanent magnified state the user can use two or more fingers
to pan the viewport. Note that in this mode the content is panned as
opposed to the viewport dragging mode in which the viewport is moved.

5. When in a permanent magnified state the user can use three or more
fingers to change the magnification scale which will become the current
default magnification scale. The next time the user magnifies the same
magnification scale would be used.

6. The magnification scale will be persisted in settings and in the cloud.

Note: Since two fingers are used to pan the content in a permanently magnified
state no other two finger gestures in touch exploration or applications
will work unless the uses zooms out to normal state where all gestures
works as expected. This is an intentional tradeoff to allow efficient
panning since in a permanently magnified state this would be the dominant
action to be performed.

Design:

1. The window manager exposes APIs for setting accessibility transformation
which is a scale and offsets for X and Y axis. The window manager queries
the window policy for which windows will not be magnified. For example,
the IME windows and the navigation bar are not magnified including windows
that are attached to them.

2. The accessibility features such a screen magnification and touch
exploration are now impemented as a sequence of transformations on the
event stream. The accessibility manager service may request each
of these features or both. The behavior of the features is not changed
based on the fact that another one is enabled.

3. The screen magnifier keeps a viewport of the content that is magnified
which is surrounded by a glow in a magnified state. Interactions outside
of the viewport are delegated directly to the application without
interpretation. For example, a triple tap on the letter 'a' of the IME
would type three letters instead of toggling magnified state. The viewport
is updated on screen rotation and on window transitions. For example,
when the IME pops up the viewport shrinks.

4. The glow around the viewport is implemented as a special type of window
that does not take input focus, cannot be touched, is laid out in the
screen coordiates with width and height matching these of the screen.
When the magnified region changes the root view of the window draws the
hightlight but the size of the window does not change - unless a rotation
happens. All changes in the viewport size or showing or hiding it are
animated.

5. The viewport is encapsulated in a class that knows how to show,
hide, and resize the viewport - potentially animating that.
This class uses the new animation framework for animations.

6. The magnification is handled by a magnification controller that
keeps track of the current trnasformation to be applied to the screen
content and the desired such. If these two are not the same it is
responsibility of the magnification controller to reconcile them by
potentially animating the transition from one to the other.

7. A dipslay content observer wathces for winodw transitions, screen
rotations, and when a rectange on the screen has been reqeusted. This
class is responsible for handling interesting state changes such
as changing the viewport bounds on IME pop up or screen rotation,
panning the content to make a requested rectangle visible on the
screen, etc.

8. To implement viewport updates the window manger was updated with APIs
to watch for window transitions and when a rectangle has been requested
on the screen. These APIs are protected by a signature level permission.
Also a parcelable and poolable window info class has been added with
APIs for getting the window info given the window token. This enables
getting some useful information about a window. There APIs are also
signature protected.

bug:6795382

Change-Id: Iec93da8bf6376beebbd4f5167ab7723dc7d9bd00
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
06efb530a479ea12398c1b3ee4b80e2ac85a1680 25-Aug-2012 Christopher Tate <ctate@google.com> Per-user settings

Each user has its own Settings.System.* and Settings.Secure.* namespace now. In
addition, this CL introduces the new Settings.Global.* namespace, which contains
a number of previously-elsewhere named settings entities; these Global.* entities
are common to all users. Because these elements have been moved from their prior
existence in the other namespaces, attempts to access them under their old names
and namespaces are detected and redirected (with appropriate compile-time and
logging messages) to their new homes.

The new Global.* namespace can only be written by system-level code, just like
the existing Secure.* namespace. If an app attempts to write a key that was
previously in the System.* namespace but has been moved to the Global.* namespace,
then a warning is logged and no write is performed; the action is a no-op. (The
app is explicitly not crashed, to avoid breaking well-behaved apps that can't
know any better.)

There is also now a hidden API for getting/setting settings entities associated
with a user other than the caller's. Reading/writing data for a user other than
yourself requires the signature-level INTERACT_ACROSS_USERS_FULL permission.

Manipulating data for a different user cannot be done via the ContentProvider
query() / insert() APIs; you must use the Settings.get/put APIs for that degree
of control. In general, use of the get/set API is *strongly* preferred over
query-type access to Settings.

Bug 6985398

Change-Id: Ibee54ddff99fb847c8c2479c23b50f1e7524d724
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
16e119e798cd1e6dd94114bc910b2c1fd92b88e5 06-Sep-2012 rich cannings <richc@google.com> Add secure setting for package verification

Framework changes to store and read a secure setting for package verification.
Default is on/true.

This setting will be turned on/off via the Settings app.

Bug: 7082362
Change-Id: I6f93d3136add8af0dbbdc664f0473c5f5b7e3fee
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
8de24dca68a34828277bf661d72110a3a3191165 05-Sep-2012 Dmitry Shmidt <dimitrysh@google.com> Restore original default Wifi sleep policy (always)

BUG: b/7092819

Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
es/values/defaults.xml
4e724c842378e84b8744db657a8e8c8ae09fa264 29-Aug-2012 John Spurlock <jspurlock@google.com> Change default setting for dreams to 'when docked'

Bug:7078718
Change-Id: I4ec74cc9562ab728d6f86938758ede74c241c63b
es/values/defaults.xml
c88a80a1d7a35eaefb54d17b60e9d3a07b800e82 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 15e099cc: am 0e0942c7: Merge "Default WiFi sleep policy setting"

* commit '15e099cc09589f963933f046d7267552ba3ffad8':
Default WiFi sleep policy setting
15e099cc09589f963933f046d7267552ba3ffad8 29-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0e0942c7: Merge "Default WiFi sleep policy setting"

* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
Default WiFi sleep policy setting
7e07147ecec50549272b4ec2f4f364102d7f379c 23-Aug-2010 Erik Ljungberg <erik.ljungberg@sonyericsson.com> Default WiFi sleep policy setting

Creates a defult.xml setting for WiFi sleep policy.

It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.

Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
1a868b7981ca5f52e893fdf9f8f538c9d5ce241d 22-Aug-2012 John Spurlock <jspurlock@google.com> Add framework support for multiple dreams.

Bug:7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
ca34bcf6746454c561b0c07ca5c6e42bd4a73e9e 16-Aug-2012 Svetoslav Ganov <svetoslavganov@google.com> resolved conflicts for merge of 80c904df to jb-mr1-dev

Change-Id: Ic2f8d64cd716d04a533ca0685d1fb0d5e2a21933
80c904df159f5a19517ec0246c35d69e40534747 16-Aug-2012 Svetoslav Ganov <svetoslavganov@google.com> am 8631701b: Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.

* commit '8631701bb770f3a4e3b2a139dc282f2244fe86e6':
Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.
8631701bb770f3a4e3b2a139dc282f2244fe86e6 16-Aug-2012 Svetoslav Ganov <svetoslavganov@google.com> Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.

1. Before JellyBean touch exploration was a global setting controlled by the user via
the UI. However, if the enabled accessibility services do not handle touch exploration
mode, enabling it makes no sense. Therefore, in JellyBean the services request touch
exploration mode and the user is presented with a dialog to allow that and if she
does we store that in the database.

As a result of the above change a user that has enabled accessibility, touch
exploration, and some accessibility services running a pre-JellyBean system
version may lose touch exploration state, thus rendering the device useless unless
sighted help is provided, since the enabled service(s) are not in the list of
services to which the user granted a permission to put the device in touch explore
mode.

The fix is during a database upgrade to allow allow all enabled accessibility
services to toggle touch exploration provided accessibility and touch exploration
are enabled and no services can toggle touch exploration. Note that the user has
already manually enabled the services and touch exploration which means the she
has given consent to have these services work in touch exploration mode

bug:6996354

Change-Id: I0af2dc578cc4fbcc90043341035163b876978ab2
rc/com/android/providers/settings/DatabaseHelper.java
9630704ed3b265f008a8f64ec60a33cf9dcd3345 28-Jul-2012 Jeff Brown <jeffbrown@google.com> Power manager rewrite.

The major goal of this rewrite is to make it easier to implement
power management policies correctly. According, the new
implementation primarily uses state-based rather than event-based
triggers for applying changes to the current power state.

For example, when an application requests that the proximity
sensor be used to manage the screen state (by way of a wake lock),
the power manager makes note of the fact that the set of
wake locks changed. Then it executes a common update function
that recalculates the entire state, first looking at wake locks,
then considering user activity, and eventually determining whether
the screen should be turned on or off. At this point it may
make a request to a component called the DisplayPowerController
to asynchronously update the display's powe state. Likewise,
DisplayPowerController makes note of the updated power request
and schedules its own update function to figure out what needs
to be changed.

The big benefit of this approach is that it's easy to mutate
multiple properties of the power state simultaneously then
apply their joint effects together all at once. Transitions
between states are detected and resolved by the update in
a consistent manner.

The new power manager service has is implemented as a set of
loosely coupled components. For the most part, information
only flows one way through these components (by issuing a
request to that component) although some components support
sending a message back to indicate when the work has been
completed. For example, the DisplayPowerController posts
a callback runnable asynchronously to tell the PowerManagerService
when the display is ready. An important feature of this
approach is that each component neatly encapsulates its
state and maintains its own invariants. Moreover, we do
not need to worry about deadlocks or awkward mutual exclusion
semantics because most of the requests are asynchronous.

The benefits of this design are especially apparent in
the implementation of the screen on / off and brightness
control animations which are able to take advantage of
framework features like properties, ObjectAnimator
and Choreographer.

The screen on / off animation is now the responsibility
of the power manager (instead of surface flinger). This change
makes it much easier to ensure that the animation is properly
coordinated with other power state changes and eliminates
the cause of race conditions in the older implementation.

The because of the userActivity() function has been changed
so that it never wakes the device from sleep. This change
removes ambiguity around forcing or disabling user activity
for various purposes. To wake the device, use wakeUp().
To put it to sleep, use goToSleep(). Simple.

The power manager service interface and API has been significantly
simplified and consolidated. Also fixed some inconsistencies
related to how the minimum and maximum screen brightness setting
was presented in brightness control widgets and enforced behind
the scenes.

At present the following features are implemented:

- Wake locks.
- User activity.
- Wake up / go to sleep.
- Power state broadcasts.
- Battery stats and event log notifications.
- Dreams.
- Proximity screen off.
- Animated screen on / off transitions.
- Auto-dimming.
- Auto-brightness control for the screen backlight with
different timeouts for ramping up versus ramping down.
- Auto-on when plugged or unplugged.
- Stay on when plugged.
- Device administration maximum user activity timeout.
- Application controlled brightness via window manager.

The following features are not yet implemented:

- Reduced user activity timeout for the key guard.
- Reduced user activity timeout for the phone application.
- Coordinating screen on barriers with the window manager.
- Preventing auto-rotation during power state changes.
- Auto-brightness adjustment setting (feature was disabled
in previous version of the power manager service pending
an improved UI design so leaving it out for now).
- Interpolated brightness control (a proposed new scheme
for more compactly specifying auto-brightness levels
in config.xml).
- Button / keyboard backlight control.
- Change window manager to associated WorkSource with
KEEP_SCREEN_ON_FLAG wake lock instead of talking
directly to the battery stats service.
- Optionally support animating screen brightness when
turning on/off instead of playing electron beam animation
(config_animateScreenLights).

Change-Id: I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
rc/com/android/providers/settings/SettingsHelper.java
3e300c46930858a219c7f3946da0a3f675076673 13-Aug-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I95bed23285699c68b623ae0e36600ec5e813db8c
Auto-generated-cl: translation import
es/values-ms/defaults.xml
es/values-pt/defaults.xml
es/values-zh-rCN/defaults.xml
63fe5cdc74f7f30666221a7f7feedeb3b3460e65 10-Aug-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8948cd5b0992133db9dc8e676b5d43b54d672e85
Auto-generated-cl: translation import
es/values-bg/defaults.xml
es/values-ca/defaults.xml
es/values-cs/defaults.xml
es/values-da/defaults.xml
es/values-de/defaults.xml
es/values-es-rUS/defaults.xml
es/values-es/defaults.xml
es/values-et/defaults.xml
es/values-hi/defaults.xml
es/values-hr/defaults.xml
es/values-in/defaults.xml
es/values-ja/defaults.xml
es/values-ko/defaults.xml
es/values-lt/defaults.xml
es/values-lv/defaults.xml
es/values-nb/defaults.xml
es/values-nl/defaults.xml
es/values-pl/defaults.xml
es/values-pt-rPT/defaults.xml
es/values-ro/defaults.xml
es/values-ru/defaults.xml
es/values-sk/defaults.xml
es/values-sl/defaults.xml
es/values-sr/defaults.xml
es/values-th/defaults.xml
es/values-tl/defaults.xml
es/values-tr/defaults.xml
es/values-vi/defaults.xml
es/values-zh-rTW/defaults.xml
es/values-zu/defaults.xml
03cfc542311604c6a4cfd641b969f361279058b3 09-Aug-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I813d5cfc5f5b60e98f635dc62e9935299c903171
Auto-generated-cl: translation import
es/values-af/defaults.xml
es/values-am/defaults.xml
es/values-ar/defaults.xml
es/values-be/defaults.xml
es/values-el/defaults.xml
es/values-en-rGB/defaults.xml
es/values-fa/defaults.xml
es/values-fi/defaults.xml
es/values-fr/defaults.xml
es/values-hu/defaults.xml
es/values-it/defaults.xml
es/values-iw/defaults.xml
es/values-sv/defaults.xml
es/values-sw/defaults.xml
es/values-uk/defaults.xml
634471edc409f00f38633e334cd6853954a2b093 09-Aug-2012 John Spurlock <jspurlock@google.com> Load default Dream settings into a clean db.

Set the Dream defaults during onCreate, not only onUpgrade.

Bug: 6959513
Change-Id: Ia93097edaf1150813c75b6be809db9c97987868f
rc/com/android/providers/settings/DatabaseHelper.java
5927d957ea36744315e958ab4a9a1f095d48721c 08-Aug-2012 Daniel Sandler <dsandler@android.com> Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev
fdb7c36a108e6a7887de6611b3f1541e3009f2d5 06-Aug-2012 Daniel Sandler <dsandler@android.com> Migrate Dreams default settings to DatabaseHelper.

Also switch Dreams on for all charging devices by default.

Change-Id: Iccbcc2906d55214320b2f467e88ba9cb188f4886
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
45576ccd760e4e2e63a54410803380c05e42d742 28-Jul-2012 Nick Kralevich <nnk@google.com> Explicitly export content providers

In a future version of Android, the default value for
<provider android:exported> will change from true to false.
Explicitly set android:exported="true"

Bug: 3306452

Change-Id: Iffe4dca4fefc92bb9f89698f149a87c16a7ce3c5
ndroidManifest.xml
33034b13cae1429d526722374bd39be3f9605ae4 10-Jul-2012 Wink Saville <wink@google.com> Create telephony-common and mms-common - DO NOT MERGE

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
ndroid.mk
rc/com/android/providers/settings/DatabaseHelper.java
5362f17ff5e8e06601b172bd86c26027ced9780c 12-Jul-2012 Wink Saville <wink@google.com> Merge commit '1b003ef0' into mit

* commit '1b003ef0':
Create telephony-common and mms-common

Change-Id: Ie8876541dbe7f4c933cf7d69910dd204538bc975
a639b311e93ad14d9ee5c2b2c215ed2d86c32d2a 10-Jul-2012 Wink Saville <wink@google.com> Create telephony-common and mms-common

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
ndroid.mk
rc/com/android/providers/settings/DatabaseHelper.java
11844b14d0aa56af4cb44560db27038921009801 26-Jun-2012 Svetoslav Ganov <svetoslavganov@google.com> am 4844fccc: am 5d88c14c: Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev

* commit '4844fccc793078f44c8bffd1707ac589fad14f6e':
Ensure screen reader URL gets updated during ICS to JB update.
4844fccc793078f44c8bffd1707ac589fad14f6e 26-Jun-2012 Svetoslav Ganov <svetoslavganov@google.com> am 5d88c14c: Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev

* commit '5d88c14cd39d1100e28f7e340874655ab7a42904':
Ensure screen reader URL gets updated during ICS to JB update.
5d88c14cd39d1100e28f7e340874655ab7a42904 26-Jun-2012 Svetoslav Ganov <svetoslavganov@google.com> Merge "Ensure screen reader URL gets updated during ICS to JB update." into jb-dev
3a67eb3be43bfd1f7735cf018c4cb552c6cbba08 22-Jun-2012 alanv <alanv@google.com> Ensure screen reader URL gets updated during ICS to JB update.

Bug: 6702042
Change-Id: I771863c53fa420ba0746fce30cd17eb8b2b9fba1
rc/com/android/providers/settings/DatabaseHelper.java
1ca3609a70e292a6971f2bfadcab10a671540151 21-Jun-2012 Svetoslav Ganov <svetoslavganov@google.com> am e523faa8: am 5070a7f0: Merge "Change hard-coded URL for accessibility script." into jb-dev

* commit 'e523faa84f656785adbbd67414f9a141ec49d800':
Change hard-coded URL for accessibility script.
e523faa84f656785adbbd67414f9a141ec49d800 21-Jun-2012 Svetoslav Ganov <svetoslavganov@google.com> am 5070a7f0: Merge "Change hard-coded URL for accessibility script." into jb-dev

* commit '5070a7f0f4bf817e884b9e6ea8ee23c99209c50e':
Change hard-coded URL for accessibility script.
3ff50a0a8ae3293a206b775878d1f677b0451375 21-Jun-2012 alanv <alanv@google.com> Change hard-coded URL for accessibility script.

The old version of the script is broken and is cached due to an error in
our gstatic configuration. We had to change the name to avoid hitting the
cached version on external proxies.

Bug: 6702042
Change-Id: I0e5ee8b3a6ae8c7ba11f5760f2f99d4b5614ac97
es/values/defaults.xml
82f47c95b638bfce0e51122617056138706bd57e 12-Jun-2012 Amith Yamasani <yamasani@google.com> Merge "Disable lockscreen using a system property."
d1645f8d0f30709340eb6b6d6da5022bbab77024 12-Jun-2012 Amith Yamasani <yamasani@google.com> Disable lockscreen using a system property.

For factory testing.

Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
rc/com/android/providers/settings/DatabaseHelper.java
01cb25fddeb03d72585ae13a8a1f1721f4bcef8c 12-Jun-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp

Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
44030b7864b0e703f5a2760d698761ce6312814f 11-Jun-2012 Athimoolam Ealumalai <athimoolam.ealumalai@sonyericsson.com> Added support for customization of mobile data setting.

Introduced system property "mobiledata", which will be
used for default behavior of the mobile data connection
either on/off.

This is analog to how the setting for "dataroaming" is
handeled.

Change-Id: Ifae8822dedfa55a515671014e2e29d43c469e701
rc/com/android/providers/settings/DatabaseHelper.java
8dfe2b9dd7b8b924177a9f67785bcd6d1b0eeada 16-May-2012 Christopher Tate <ctate@google.com> Merge restored wifi APs, don't overwrite

We now preserve any already-known AP configuration information when
restoring wifi from backup, instead of flatly overwriting the known
definitions with the historical ones. This means that if you are
performing setup while connected to an AP unknown in the restored
dataset, you will retain your connection instead of seeing it drop
partway through the restore process because suddenly the supplicant
"forgot" how to connect to it.

Duplicates are resolved by retaining the currently-defined network
configuration and discarding the historical one.

Bug 6443790

Change-Id: I1f44cc6a01fc4ae7c4b680682a10fcb7a0be65dc
rc/com/android/providers/settings/SettingsBackupAgent.java
3c60eeb1332661833638c863b2978422c2846140 08-May-2012 Daisuke Miyakawa <dmiyakawa@google.com> Have a new constant for "vibrate when ringing" setting

Bug: 6036529
Change-Id: I850d27629a75615647883fdaa2933f337c4824d1
rc/com/android/providers/settings/DatabaseHelper.java
bffc3d1bd33eb2d8e00a9f8b6261d815db503311 08-May-2012 Eric Laurent <elaurent@google.com> Silent and Vibrate mode clean up

Clean up related to new Vibration policy.
The vibrate behavior is now only derived from:
- presence of a vibrator on the device
- current ringer mode selected: NORMAL, VIBRATE or SILENT
If no vibrator is present the ringer mode can only be NORMAL or SILENT.

The control of ringer mode via volume keys when volume keys control the "master"
stream type (RING on phones, MUSIC on tablets) is as follows:
If a vibrator is present:
VOL- and volume equals 1: NORMAL => VIBRATE
VOL- and volume equals 0 and not continuous press: VIBRATE => SILENT
VOL+ and in SILENT mode: SILENT => VIBRATE
VOL+ and in VIBRATE mode: VIBRATE => NORMAL, volume = 1
If no vibrator is present:
VOL- and volume equals 0 and not continuous press: NORMAL => SILENT
VOL+ and in SILENT mode: SILENT => NORMAL, volume = 0

VIBRATE_ON and VIBRATE_IN_SILENT settings are not stored/retreived any more.

AudioService checks and corrects ringer mode and stream volumes if necessary when reading from
DB at boot time.

Also:
Added dump for stream volumes in AudioService.
Added device names missing in AudioSystem for USB accessory and USB device.

Issue: 6036529
Issue: 6414950
Issue: 6448163

Change-Id: I77fb821ec63e4e566320cac2701b4ac466e86aef
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsHelper.java
4f4f5166c9379a646de887c4d9ae58fc94afb6ed 27-Apr-2012 Irfan Sheriff <isheriff@google.com> Fetch WifiManager instance at the time of use

Bug: 5340393
Change-Id: Idb0a6dbe969bc3c7955134df43b86f28208c73c3
rc/com/android/providers/settings/SettingsBackupAgent.java
47847f3f4dcf2a0dbea0bc0e4f02528e21d37a88 23-Mar-2012 Jeff Brown <jeffbrown@google.com> Support enabling WAL using a flag when DB is opened.

Using enableWriteAheadLogging() to enable WAL is inefficient because
we previously disabled WAL mode when the database was opened.
Switching from WAL to PERSIST then back to WAL is inefficient
and could slow down application launch time. It would be better
to leave the database in WAL mode when we open it to begin with.

To do that, we need to know ahead of time whether we will want to
have WAL enabled for the newly opened database.

Using this flag also reduces the chance that we will encounter
an error enabling WAL mode due to there being other open connections
to the database.

Bug: 6124556
Change-Id: I38ec7a528baeda9f1ef77e25e88b3ca4b6296200
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
e7ee9a0504db7127be05a2c27794f6a2b20b2951 12-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I183552feb00f1764db73bf6c7f16d5f5ef0f3b0f
es/values-in/strings.xml
6ff1f4fa5d807fed43f5f0446adc3261c8cb3e31 07-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I7cfb3eeb7743f4db15ff591826d16cc316e2d915
es/values-in/strings.xml
79f5a0416fe76d5063b4d9995edd84a49b77995e 13-Feb-2012 Mike Lockwood <lockwood@google.com> WifiStateTracker: add support for overriding DCHP max retry count in an overlay

Bug: 5551068

Signed-off-by: Mike Lockwood <lockwood@google.com>

Conflicts:

packages/SettingsProvider/res/values/defaults.xml

Change-Id: I6a6519316a87bd1af39ea9dc51e0d312011135ef
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
d3c5e1eca12f4ca618e3f671dc6fae48307ec895 06-Jan-2012 Mike Lockwood <lockwood@google.com> Allow disabling network stats support in a resource overlay

Bug: 5771240

Signed-off-by: Mike Lockwood <lockwood@google.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
2395527c9bb1cdc3bcd3dfcbc8b72b90ed3e7080 21-Oct-2011 Mike Lockwood <lockwood@android.com> SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88 21-Oct-2011 Mike Lockwood <lockwood@android.com> Load lockscreen.disabled setting on database create as well as upgrade

Signed-off-by: Mike Lockwood <lockwood@android.com>
rc/com/android/providers/settings/DatabaseHelper.java
7bef73900b075fc0a9078d418964ca8e7210d565 20-Oct-2011 Mike Lockwood <lockwood@android.com> SettingsProvider: Add support for overriding lockscreen.disabled default value

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
4b797dd8c1d059510b12957acc3bd0b236308bb3 20-Oct-2011 Mike Lockwood <lockwood@android.com> Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
fc2cbe9b46ab17a401dc50f8e0dbb677ed012299 30-Dec-2011 Naveen Kalla <nkalla@quicinc.com> Separate SIM states from Radio states

Radio state reflects the state of the modem. SIM_READY, RUIM_READY,
NV_READY are subscription states and it is possible that the new cards
have multiple subscriptions. Remove the SIM states from Radio State and
introduce a new VOICE_RADIO_TECH message to identify the exact voice
technology. SIM states will continue to be identified from the
SIM_STATUS messages.

Change-Id: Ia67d54f43b6c3340d9cf5c27fcb6f7ef49ef4d40
rc/com/android/providers/settings/DatabaseHelper.java
398c83cc07354ca28c7108b712017146dadd41a0 13-Dec-2011 Amith Yamasani <yamasani@google.com> Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB.

Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.

Change-Id: I0f15a3d1ea8502d542e3178f732cc2503104458f
rc/com/android/providers/settings/DatabaseHelper.java
3066afdc6f729279b1dfd743bbdead73f889249f 12-Dec-2011 Amith Yamasani <yamasani@google.com> Update VIBRATE_ON to a supported value when upgrading from GB.

Bug: 5738552

If value has ringer set to VIBRATE_OFF, we need to update it to the
now default, as VIBRATE_OFF is inconsistent with the new UI controls.

Make sure notification vibrate setting follows ringer vibrate setting.
Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19
rc/com/android/providers/settings/DatabaseHelper.java
3ca5a74c17a27e44ce13b39bc2f63edaa88c3ef5 07-Dec-2011 Svetoslav Ganov <svetoslavganov@google.com> Make the URL for the JavaScript based screen-reader used by WebView configurable.

The URl from which to inject a screen-reader for WebView accessiblity support should be
configurable because: 1) The accessibility engineering team should be able to point
devices to a staging build of the screen-reader; 2) We would like to be able to change
this URL via the Google services mechanism.

bug:5718543

Change-Id: I3d4d343f1c93e0e0173f04b2912949fe8a3566b9
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
6243edd818b84adfbe712d5d233d6414b33653ac 06-Dec-2011 Amith Yamasani <yamasani@google.com> New and improved silent mode on lockscreen.

3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
rc/com/android/providers/settings/DatabaseHelper.java
ea25ea7ef30be14dd940f1667e0308bfff5b4d85 06-Dec-2011 Svetoslav Ganov <svetoslavganov@google.com> Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
f5b8671c340f189c50b41c53622f979b6d5e0a57 06-Dec-2011 Dianne Hackborn <hackbod@google.com> Fix issue #5714517: App shortcuts can result in bad task intents

New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.

Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
rc/com/android/providers/settings/DatabaseHelper.java
55f937abe1a4fedb86c2679c66f0b5220ec3780e 05-Dec-2011 Svetoslav Ganov <svetoslavganov@google.com> Adding a system preference whether to speak passwords in accessibility mode.

By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.

bug:5712607

Change-Id: I6eb0c40834abe5297f7dc74be02d180a5bef0174
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
be6ab576ff0e3bf2a8dc3feee6f476061afbda30 29-Nov-2011 Jeff Brown <jeffbrown@google.com> Merge "Fix application launch shortcuts." into ics-mr1
6651a638348c15e89e265b0a53c775cac9beafa2 28-Nov-2011 Jeff Brown <jeffbrown@google.com> Fix application launch shortcuts.

Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys. Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos. The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
es/xml/bookmarks.xml
rc/com/android/providers/settings/DatabaseHelper.java
fa56c714f2571ba4f8201b3d279d67b975d19f5d 29-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
es/values-vi/strings.xml
5cd1500cc4229fa6a8ddb5c70b055bb2c936c650 16-Nov-2011 Amith Yamasani <yamasani@google.com> Don't upgrade some settings from GB to ICS.

Copy the value of AUTO_TIME to AUTO_TIME_ZONE.
Don't upgrade screen timeout and auto brightness.

Bug: 5607851, 5217460

Also fix the default for vibrate mode. Bug: 5553900

Change-Id: I1b8d5215d55953f2b686e77bf55fd07110a08b8d
rc/com/android/providers/settings/DatabaseHelper.java
994da2ad3242407fd822e6b35e3d302a3667d9c3 10-Nov-2011 Tom Taylor <tomtaylor@google.com> Revert "Add new secure setting for controlling Messaging notifications"

This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

Committer: Tom Taylor <tomtaylor@google.com>

On branch revertsetting
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: api/current.txt
modified: core/java/android/provider/Settings.java
modified: core/java/android/provider/Telephony.java
modified: packages/SettingsProvider/res/values/defaults.xml
modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
ea54b7608584bc0535c9e89417778c3e95b50975 08-Nov-2011 Robert Greenwalt <robdroid@android.com> Merge "Wimax : wimax framework related open source." into ics-mr1
148c7d0de720a92632aa6ed10a39bfc38b427239 13-Oct-2011 tk.mun <tk.mun@samsung.com> Wimax : wimax framework related open source.

Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
es/values/defaults.xml
03da2f00aac04e6565a02cf5a9bf6bb1ec926930 07-Nov-2011 Tom Taylor <tomtaylor@google.com> Add new secure setting for controlling Messaging notifications

Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.

Change-Id: I4d2721191b86010efb383a24c28d911496440657
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
9ac5d49125cf252df6c171f7a4a0b304e0ad69b5 01-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I43513501e2c0eee9339551d0f20411d14bd5eace
es/values-be/strings.xml
es/values-et/strings.xml
b0d150aa53ad34ea0a5b0da74bbdeb9ecd5a46b7 19-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I83ab00ec220b7c0ba0d37e7f4c91e945e35aab39
es/values-hi/strings.xml
89038b4df8608321ad2f7706d0703641e723de3c 18-Oct-2011 Justin Ho <justinho@google.com> Update Settings Storage app icon

Change-Id: Ic4057f61a7e11fcfceb619ded7152621718262c0
es/drawable-hdpi/ic_launcher_settings.png
es/drawable-mdpi/ic_launcher_settings.png
es/drawable-xhdpi/ic_launcher_settings.png
1d8e7d640ad5ed6fe82bca017293dd89169f1c2e 10-Oct-2011 Jeff Brown <jeffbrown@google.com> Fix Cursor leak in SettingsBackupAgent.
Bug: 5434060

Change-Id: I805695a30d6778d0c7302e63bcfe3dc1a38488f4
rc/com/android/providers/settings/SettingsBackupAgent.java
a571a5836cdbc71feefb13648004b8ca7fe05dfb 21-Sep-2011 Svetoslav Ganov <svetoslavganov@google.com> Settings are restored in alphabetical order rather in order of dependency.

Settings were restore in alphabetical order and capturing dependency
among them required keys to be chosen in such a way that after sorting
they apprear in dependency order. Now settings are exported and restored
in the order they are declared in the arrays of settings to backup.
Hence, the order in this array will capture the dependency order.

bug:5343351

Change-Id: I93a40bcdd194943cd6f85aa18f1557d546e38274
rc/com/android/providers/settings/SettingsBackupAgent.java
d2509fd83597595914ef0627685e917380863eb6 12-Sep-2011 Dianne Hackborn <hackbod@google.com> Add boot mode where only "core apps" are started.

A core app is one that has coreApp="true" in its manifest tag.

The system can successfully boot (though a little painfully) with
only framework-res.apk, SettingsProvider.apk, SystemUI.apk,
DefaultContainerService.apk, and Launcher2.apk set as core apps.

Currently this boot mode is always turned off.

Change-Id: Ieaa4a8031c2c391a12996aa8d8b1d65fc2b09d6b
ndroidManifest.xml
8d32a01bd24b8a0d1a98f0581b3394a78fab8242 09-Aug-2011 Nick Pelly <npelly@google.com> Add NFC to airplane mode

NFC now observes airplanes mode, and is by default toggleable in airplane mode.

Change-Id: I5f19d35422c9eb1cffb0b5e0631b3f3c5eeaedcf
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
e6087d771543e896888249ddd7dcc638ce70a2a0 05-Aug-2011 Amith Yamasani <yamasani@google.com> Don't change system sound defaults for upgrades.

This reverts an earlier change that reset the system sound defaults even
for upgrades.

Bug: 5114198
Change-Id: Ide0afbd26080ba87d177cedfa9b1d50352857a00
rc/com/android/providers/settings/DatabaseHelper.java
42722bfa136f5616872a2c4e199813e804621c81 22-Jul-2011 Amith Yamasani <yamasani@google.com> Volume panel changes.

Combined volume panel only in tablets. On phones show active volume.
Added dummy assets for ring+notification icon.

Deprecated the NOTIFICATION_USES_RING_VOLUME. Now they are always
tied together. Audio manager changes still required to ensure that.

Initialize all feedback sounds to true.

Change-Id: I3ad7890c9be9334eedb5f3b709a4b6995fe24638
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
0a779813e1d0c7a8e896f2d22869d226166c34e8 29-Jul-2011 Christopher Tate <ctate@google.com> Merge "Support full-backup encryption and global backup password"
2efd2dbbac9eac89620683696c6076463c3a1cd6 20-Jul-2011 Christopher Tate <ctate@google.com> Support full-backup encryption and global backup password

If the user has supplied a backup password in Settings, that password
is validated during the full backup process and is used as an encryption
key for encoding the backed-up data itself. This is the fundamental
mechanism whereby users can secure their data even against malicious
parties getting physical unlocked access to their device.

Technically the user-supplied password is not used as the encryption
key for the backed-up data itself. What is actually done is that a
random key is generated to use as the raw encryption key. THAT key,
in turn, is encrypted with the user-supplied password (after random
salting and key expansion with PBKDF2). The encrypted master key
and a checksum are stored in the backup header. At restore time,
the user supplies their password, which allows the system to decrypt
the master key, which in turn allows the decryption of the backup
data itself.

The checksum is part of the archive in order to permit validation
of the user-supplied password. The checksum is the result of running
the user-supplied password through PBKDF2 with a randomly selected
salt. At restore time, the proposed password is run through PBKDF2
with the salt described by the archive header. If the result does
not match the archive's stated checksum, then the user has supplied
the wrong decryption password.

Also, suppress backup consideration for a few packages whose
data is either nonexistent or inapplicable across devices or
factory reset operations.

Bug 4901637

Change-Id: Id0cc9d0fdfc046602b129f273d48e23b7a14df36
rc/com/android/providers/settings/SettingsBackupAgent.java
7434fe8be43cf45148d9a49480ced78bb3189565 29-Jul-2011 Svetoslav Ganov <svetoslavganov@google.com> Merge "Updaing the database version"
97c3311bb84c7a0a75f3c42c8c781ca836c7a5c6 28-Jul-2011 Svetoslav Ganov <svetoslavganov@google.com> Updaing the database version

Change-Id: Iff671a152ac8c96d4136f0f268167c1b60842bb5
rc/com/android/providers/settings/DatabaseHelper.java
8cbe6e8f124456acbe8a6b8ff37aef88b0d5c6be 28-Jul-2011 Svetoslav Ganov <svetoslavganov@google.com> Merge "Updating the data base upgrade/creation code for the new touch exploraion setting."
a28a16d1c2b58999d757a4cd3bc66a2f3499a2eb 28-Jul-2011 Svetoslav Ganov <svetoslavganov@google.com> Updating the data base upgrade/creation code for the new touch exploraion setting.

1. Update the database creation/upgrade code to take care of the new setting
to enable touch exploration.

2. Made the tocuh exploration settings persistent to the cloud.

Change-Id: Ie24e9184b4a21869432d11d207cb6464fadbac3b
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
3a6c36fdd7fac368355f93d6133fd88a94f50ce7 26-Jul-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ia9c97db0cd31b9d3163318b4193a328a614a7098
es/values-zu/strings.xml
c1d4166289ce016965d1147f7e8d37862ee347ec 19-Jul-2011 Eric Laurent <elaurent@google.com> Fix issue 5012047: silent mode mutes music

Implemented different silent mode behaviors for tablets and phones.
The behavior inherited from Honeycomb was for tablets only and
was muting music in silent mode.

Change-Id: Ib053e7b70ca02190debc87648ab8a163f9d39577
rc/com/android/providers/settings/DatabaseHelper.java
fa53d3002fadf8640600c1840962021a821b8bae 08-Jul-2011 Gilles Debunne <debunne@google.com> Animation settings reset to default

Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
rc/com/android/providers/settings/DatabaseHelper.java
79ec80db70d788f35aa13346e4684ecbd401bd84 24-Jun-2011 Christopher Tate <ctate@google.com> Make full backup API available to apps

New methods for full backup/restore have been added to BackupAgent
(still hidden): onFullBackup() and onRestoreFile(). The former is the
entry point for a full app backup to adb/socket/etc: the app then writes
all of its files, entire, to the output. During restore, the latter
new callback is invoked, once for each file being restored.

The full backup/restore interface does not use the previously-defined
BackupDataInput / BackupDataOutput classes, because those classes
provide an API designed for incremental key/value data structuring.
Instead, a new FullBackupDataOutput class has been introduced, through
which we restrict apps' abilities to write data during a full backup
operation to *only* writing entire on-disk files via a new BackupAgent
method called fullBackupFile().

"FullBackupAgent" exists now solely as a concrete shell class that
can be instantiated in the case of apps that do not have their own
BackupAgent implementations.

Along with the API change, responsibility for backing up the .apk
file and OBB container has been moved into the framework rather than
have the application side of the transaction do it.

Change-Id: I12849b06b1a6e4c44d080587c1e9828a52b70dae
ndroidManifest.xml
rc/com/android/providers/settings/SettingsBackupAgent.java
f12fbcd608b8f73901882c305572ac2c1cfe9beb 29-Jun-2011 Christopher Tate <ctate@google.com> Fix settings restore even harder

Change-Id: If6920743ae92dcf811a87a1eefd357f849c03a23
rc/com/android/providers/settings/SettingsBackupAgent.java
28cdb9e104e03680d61c3e6dd654d1beff51427d 25-Jun-2011 Christopher Tate <ctate@google.com> Fix settings restore

Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
rc/com/android/providers/settings/SettingsBackupAgent.java
1324f22d8dc1a26fe481fd33511bdae04c81ac14 13-Jun-2011 Mike Lockwood <lockwood@android.com> Settings: Remove unused USE_PTP_INTERFACE setting

Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
023180409516b463b7358ec42bd3a810b2e225c3 09-Jun-2011 Wink Saville <wink@google.com> am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE

* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
Fix default preferred network.
d6bcfd1cd081b9fe553976a0191a814b929c583e 08-Jun-2011 Wink Saville <wink@google.com> Fix default preferred network.

Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
rc/com/android/providers/settings/DatabaseHelper.java
7218d830e27d81141588cd6e37f206d141a18f62 04-Jun-2011 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of ca2b552d to master

Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
1a84fd1fb7a51f3fe4f8865e1cdd09f3490f696c 02-Jun-2011 Jeff Brown <jeffbrown@android.com> Add a preference panel for mouse speed.

Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
75a99709accef8cf221fd436d646727e7c8dd1f1 19-May-2011 Christopher Tate <ctate@google.com> Restore from a previous full backup's tarfile

Usage: adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'. The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
of other system state is not yet captured in the full backup. This
means that for practical purposes this is usable for 3rd party
apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
8447a13f9cdc87b5dbb865ad2d55fe2d6ea87294 27-May-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
4a627c71ff53a4fca1f961f4b1dcc0461df18a06 01-Apr-2011 Christopher Tate <ctate@google.com> Full local backup infrastructure

This is the basic infrastructure for pulling a full(*) backup of the
device's data over an adb(**) connection to the local device. The
basic process consists of these interacting pieces:

1. The framework's BackupManagerService, which coordinates the
collection of app data and routing to the destination.

2. A new framework-provided BackupAgent implementation called
FullBackupAgent, which is instantiated in the target applications'
processes in turn, and knows how to emit a datastream that contains
all of the app's saved data files.

3. A new shell-level program called "bu" that is used to bridge from
adb to the framework's Backup Manager.

4. adb itself, which now knows how to use 'bu' to kick off a backup
operation and pull the resulting data stream to the desktop host.

5. A system-provided application that verifies with the user that
an attempted backup/restore operation is in fact expected and to
be allowed.

The full agent implementation is not used during normal operation of
the delta-based app-customized remote backup process. Instead it's
used during user-confirmed *full* backup of applications and all their
data to a local destination, e.g. via the adb connection.

The output format is 'tar'. This makes it very easy for the end
user to examine the resulting dataset, e.g. for purpose of extracting
files for debug purposes; as well as making it easy to contemplate
adding things like a direct gzip stage to the data pipeline during
backup/restore. It also makes it convenient to construct and maintain
synthetic backup datasets for testing purposes.

Within the tar format, certain artificial conventions are used.
All files are stored within top-level directories according to
their semantic origin:

apps/pkgname/a/ : Application .apk file itself
apps/pkgname/obb/: The application's associated .obb containers
apps/pkgname/f/ : The subtree rooted at the getFilesDir() location
apps/pkgname/db/ : The subtree rooted at the getDatabasePath() parent
apps/pkgname/sp/ : The subtree rooted at the getSharedPrefsFile() parent
apps/pkgname/r/ : Files stored relative to the root of the app's file tree
apps/pkgname/c/ : Reserved for the app's getCacheDir() tree; not stored.

For each package, the first entry in the tar stream is a file called
"_manifest", nominally rooted at apps/pkgname. This file contains some
metadata about the package whose data is stored in the archive.

The contents of shared storage can optionally be included in the tar
stream. It is placed in the synthetic location:

shared/...

uid/gid are ignored; app uids are assigned at install time, and the
app's data is handled from within its own execution environment, so
will automatically have the app's correct uid.

Forward-locked .apk files are never backed up. System-partition
.apk files are not backed up unless they have been overridden by a
post-factory upgrade, in which case the current .apk *is* backed up --
i.e. the .apk that matches the on-disk data. The manifest preceding
each application's portion of the tar stream provides version numbers
and signature blocks for version checking, as well as an indication
of whether the restore logic should expect to install the .apk before
extracting the data.

System packages can designate their own full backup agents. This is
to manage things like the settings provider which (a) cannot be shut
down on the fly in order to do a clean snapshot of their file trees,
and (b) manage data that is not only irrelevant but actively hostile
to non-identical devices -- CDMA telephony settings would seriously
mess up a GSM device if emplaced there blind, for example.

When a full backup or restore is initiated from adb, the system will
present a confirmation UI that the user must explicitly respond to
within a short [~ 30 seconds] timeout. This is to avoid the
possibility of malicious desktop-side software secretly grabbing a copy
of all the user's data for nefarious purposes.

(*) The backup is not strictly a full mirror. In particular, the
settings database is not cloned; it is handled the same way that
it is in cloud backup/restore. This is because some settings
are actively destructive if cloned onto a different (or
especially a different-model) device: telephony settings and
AndroidID are good examples of this.

(**) On the framework side it doesn't care that it's adb; it just
sends the tar stream to a file descriptor. This can easily be
retargeted around whatever transport we might decide to use
in the future.

KNOWN ISSUES:

* the security UI is desperately ugly; no proper designs have yet
been done for it
* restore is not yet implemented
* shared storage backup is not yet implemented
* symlinks aren't yet handled, though some infrastructure for
dealing with them has been put in place.

Change-Id: Ia8347611e23b398af36ea22c36dff0a276b1ce91
ndroidManifest.xml
rc/com/android/providers/settings/SettingsBackupAgent.java
aef35dde4d687b98146c449639a06f21228a0acc 21-Apr-2011 Kenny Root <kroot@google.com> Increment database version to 65

The onUpgrade path was upgrading the database version to 65, but the
current version was marked as 64. That led to the database being
upgraded to 65 and then wiped because it didn't match 64.

This was introduced in HC change 54d068ec6af0ee6d261a135400efe6816c6f5ffe

Bug: 4319406
Change-Id: Ib6efcf34e820948d23d3a2b8ef3afc9012a93c22
rc/com/android/providers/settings/DatabaseHelper.java
4aeca7c5908387bc7efb0785830aea1053264062 11-Mar-2011 Irfan Sheriff <isheriff@google.com> Backup and restore IP and proxy settings

Bug: 4081954
Change-Id: I27266637c6ade0c5c8242792176d1edae0983446
rc/com/android/providers/settings/SettingsBackupAgent.java
54d068ec6af0ee6d261a135400efe6816c6f5ffe 02-Mar-2011 Svetoslav Ganov <svetoslavganov@google.com> Add system wide management of core settings

bug:3505060

Since we want to have some settings that are used very frequently
by many applications (long-press timeout is one example) these should
be managed efficiently to reduce lookups from different processes
because in the case of a cache miss a disk I/O is performed. Now
the system manages such core settings and propagates them to the
application processes.

Change-Id: Ie793211baf8770f2181ac8ba9d7c2609dfaa32a7
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
32c80a27dae4a3094f647bb4d97b27a0eb3b985e 26-Feb-2011 Jesse Wilson <jessewilson@google.com> Handle rename of LruCache.entryEvicted to entryRemoved

Change-Id: I50e5a8d8c35c4431f42c7483172447ba0e4e125b
http://b/3461302
rc/com/android/providers/settings/SettingsProvider.java
0c7faeee47e7629f2d23a2e3b25bc4f121252080 10-Feb-2011 Jesse Wilson <jessewilson@google.com> Adopt LruCache in SettingsProvider.

Change-Id: I223ed2a4bd90234ea7e3447f19e18c68beae2763
http://b/3184897
rc/com/android/providers/settings/SettingsProvider.java
25101b0b9a84571ead15b26e9f4cd9c4298d7823 02-Feb-2011 Eric Laurent <elaurent@google.com> Fix issue 3371080

Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
rc/com/android/providers/settings/DatabaseHelper.java
d99d0dc43a3c26c77dd22e405efbdf0753d8309e 01-Feb-2011 Paul Westbrook <pwestbro@google.com> Enable retrieving default download manager settings

Enable retrieving the default download manager settings from
a resource, when the SettingsProvider database is created

The default setting for these values is -1, which will cause
DownloadManger to not enforce a limit.

Bug: 3341145
Change-Id: I25294d0f75fb0bdf20d4bef54457056c25c31add
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
43dee06479d96d51e895704a9ee480232224c761 20-Jan-2011 Amith Yamasani <yamasani@google.com> Set the default state of NOTIFICATIONS_USE_RING_VOLUME.

Bug: 3365600

This doesn't affect upgrades, only new installs.

Don't backup/restore NOTIFICATIONS_USE_RING_VOLUME anymore as it doesn't
work well across device types and can wedge the device into a state
where you can never hear notification sounds.

Change-Id: I703e1db539eb4ac45b273f46ada0b4bbf3b981bb
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
bfc3ce78f4b9b4a720e48b3cc276e81a3fa8cfb2 13-Jan-2011 Svetoslav Ganov <svetoslavganov@google.com> Updating the WebView accessibility key bindings after discussion with the access-eng team

Change-Id: I39a303864b94a8a11b6cded9b8bb23041ad91502
es/values/defaults.xml
b01c3d2bf2d81d30b6b0b1f8012a2bcbbad5acd2 11-Jan-2011 Svetoslav Ganov <svetoslavganov@google.com> WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.

bug:3341772

1. Now a key in the binding is represented as a long with 32 MSB for modifiers and 32 LSB for keyCode.

bug: 3340732

1. Added check in the WebView key handling code to diable the accessibility injector/injected script in
case accessibility is been disabled after loading the content.

Change-Id: Ic3746dff16ec77ba682a5b139cec0e6afd8fc839
es/values/defaults.xml
01a479ccc4c8d13dc56a2eced4055a7864a7abc3 11-Jan-2011 Vasu Nori <vnori@google.com> bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider

why is settingsprovider doing getReadbleDatabase() in onCreate() method?
it shoul do getWritableDatabse() so that sqlite's WAL
feature can be enabled on it.

Change-Id: I60e46ce240a6474bbb50ab26fb1d979242b0c9ad
rc/com/android/providers/settings/SettingsProvider.java
fe53015b0bfe0a26fa62c056b02fdfe399cff904 09-Jan-2011 Amith Yamasani <yamasani@google.com> Merge "Update default for auto-brightness." into honeycomb
c93fb656dc9393f194c623dc897c5352d9192544 06-Jan-2011 Svetoslav Ganov <svetoslavganov@google.com> bug:3325039 Making the cursor ring movement send accessibility events.

1. Added a mechanism to select the cursor ring content if accessibility is
enabled - This is achieved by sending an event to the WebCore thread
(if accessibility is enabled) to select the content of the cursor when
the latter moves. Added code in WebViewCore to select the given node
and notify the UI thread for the selection markup which is delivered
of the accessibility injector which manages sending accessibility
events. This is relevant for adding accessibility to WebView if
JavaScript is not enabled. (If JS is enabled we inject a screenreader
written in JS).

2. Fixed the event delegation to the accessibility injector since it
should be able to consume key events of interest and perform some
action which leads to sending appropriate accessibility event.
In the previous implementation it was possible that the injector
consumes the event but the latter was bubbled up.

3. Added function to scroll the selection into view while moving it
around based on user commands.

Note: This is a part of two project commmit.

Change-Id: Ibb81d0468726efbe3bf6e3add1b19c69e3206638
es/values/defaults.xml
f50c5113d0a426ba0a689b5a827f80bf9d2467e1 07-Jan-2011 Amith Yamasani <yamasani@google.com> Update default for auto-brightness.

Bug: 3297046
Change-Id: I92e34a85332988bb3faa1e1997ccc85abf4b5dec
rc/com/android/providers/settings/DatabaseHelper.java
caab4d0a509a5283b65d7c44e66b0dc7b89a6d7c 10-Dec-2010 Jeff Brown <jeffbrown@google.com> Update shortcuts.

Also modified the shortcut key handling so that it drops chorded
Search+X keys when even if no shortcut was found. Without this
change, pressing an unhandled shortcut causes the Search widget to
pop up and the character to be typed.

Bug: 3022227
Change-Id: Ic0921428bd1270604ca28caf1f8493727127f4ed
es/xml/bookmarks.xml
d09a98173b99852c78c0a14282612836178cc2ab 02-Dec-2010 Eric Fischer <enf@google.com> Rename Indonesian and Hebrew translations to match Locale.java conventions

Change-Id: Icf4f1896d13a4b6bf86503b16bde189f1834fdcc
es/values-he/strings.xml
es/values-id/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
65340f1c411bfe7415941decefd37017ab0c3f71 19-Nov-2010 Amith Yamasani <yamasani@google.com> Merge "Update screen timeout again."
79373f660bd41d3824ce8c121077b29dfa4c29d9 19-Nov-2010 Amith Yamasani <yamasani@google.com> Update screen timeout again.

Bug: 3165933
rc/com/android/providers/settings/DatabaseHelper.java
113141e0914d36c378c26507b8d9dc0bb634bc8d 18-Nov-2010 Eric Fischer <enf@google.com> Import initial translations for 20 new locales.

Change-Id: I37d479c9d6293eb57d68ad686d00838445a18890
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-he/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-id/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
7078789a39f51e473bdf864e16202f67ce8ca219 17-Nov-2010 Brad Fitzpatrick <bradfitz@android.com> More cleanups from CloseGuard reports.

Change-Id: Ib3d5428073563d564fe45475127eb2cec177ab49
rc/com/android/providers/settings/SettingsBackupAgent.java
0038931043f8edf9c32645e5caf96f217cef01de 05-Nov-2010 Amith Yamasani <yamasani@google.com> Adjust default screen timeout.

Bug: 3165933
rc/com/android/providers/settings/DatabaseHelper.java
b73617de462579f7c12c25a4c2747c576f00f6a2 17-Aug-2010 Daniel Sandler <dsandler@google.com> Rotation lock.

IWindowManager now supports two new methods,
freezeRotation() and thawRotation(), that allow a caller to
temporarily stash the device's current rotation as the
default rotation (when no other constraints are present).

The system bar uses this to implement a user-accessible
rotation lock by calling freezeRotation() and then turning
off accelerometer-based display rotation; unless overridden
by an app, the display will continue to appear in the frozen
rotation until the rotation is unlocked by the user (either
via the rotation lock icon in the system bar or by checking
"rotate screen automatically" in Settings).

Bug: 2949639
Change-Id: Icd21c169d1053719590e72401f229424b254622f
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
174718b28d29f82e2e4a59a3199b28c477e54470 30-Sep-2010 Svetoslav Ganov <svetoslavganov@google.com> 3012761 Please fix problems with your strings

Change-Id: I429632381e862b2ad1e9e22402ef17863458d88f
es/values/defaults.xml
7bb95b030cf187c3301804739fd764a7b8a7e013 25-Sep-2010 Nick Kralevich <nnk@google.com> am 6c48f228: am 0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread

Merge commit '6c48f228f10c63f83c25fc0c86a5a739266c61a9'

* commit '6c48f228f10c63f83c25fc0c86a5a739266c61a9':
Use the default SecureRandom provider.
9bb4ec484b9b9518bf5b17484dcb50727c58b5d1 24-Sep-2010 Nick Kralevich <nnk@google.com> Use the default SecureRandom provider.

Don't be tricky when trying to set the seed for the secure
random number generator. Setting the seed manually eliminates
the internal randomization the SecureRandom class does automatically,
reducing randomness. Just use the default seed, which is designed
to be safe.

Change-Id: I5747c2b3a10cf04e33d2202195951ed5cb82b2fe
rc/com/android/providers/settings/SettingsProvider.java
ad450be78bb99a965b6aeb7cec04f865da59f052 17-Sep-2010 Amith Yamasani <yamasani@google.com> Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time.

Have the NITZ provider honor the new setting before updating the time zone.
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
585f13f8dec4cbf55b3bc04d95425d647f0577b2 10-Aug-2010 Svetoslav Ganov <svetoslavganov@google.com> Accessibility support for WebViews

Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
2c24516e58c2ac8d166b1866a6b5b2085b4f321e 31-Aug-2010 Jake Hamby <jhamby@google.com> am 04bc8070: am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.

Merge commit '04bc807057d1c336a5d1340595b790eee4c5b372'

* commit '04bc807057d1c336a5d1340595b790eee4c5b372':
Allow Bluetooth radio to be toggled in Airplane mode.
6659284d68bb04539891456700c8da2d0bae7d09 25-Aug-2010 Jake Hamby <jhamby@google.com> Allow Bluetooth radio to be toggled in Airplane mode.

Add "bluetooth" to the list of toggleable radios. Because this string
is in the Settings DB, I had to bump the version number. Why is this in
the settings DB anyway, rather than a carrier config option?

I also discovered that the SystemUI package copied the entire contents of
res/values/defaults.xml from SettingsProvider, when I originally tried
to update the unreferenced SystemUI version of the setting. To prevent
future confusion, I removed all of the values from the SystemUI version
of res/values/defaults.xml.

Change-Id: Ib8a75c85b9db5c1963b65538ee2765d5087e67d2
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
eabe8bfaf8c45289a4cfd880f4107d1a9b17e38b 31-Aug-2010 Mike Lockwood <lockwood@android.com> Add settings option for running MTP server in PTP mode.

This can be used as a compatibility workaround for host operating systems
without MTP support.

Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
c026d5cf2fde3006d05bf7fa8b2f61e61afc1d95 28-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread

Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
Fix some bugs in SettingsProvider that I introduced the other day.
3a2952baf1151f3d96d46cb3bbed600a087e14e8 27-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Fix some bugs in SettingsProvider that I introduced the other day.

BUG=2953979

Change-Id: Ic9813e0ce629c56050d626ed52de67e6ab1ab07e
rc/com/android/providers/settings/SettingsProvider.java
176d0af368d163b8f2c36ea0474df734d3a105ce 25-Aug-2010 Christopher Tate <ctate@google.com> am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo

Merge commit '384759b1c5e39d0f99fa551a369ae73197ab26c5'

* commit '384759b1c5e39d0f99fa551a369ae73197ab26c5':
Make the default backup configuration "disabled; local transport selected"
2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1 25-Aug-2010 Christopher Tate <ctate@google.com> am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo

Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread

* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
268957bcaffe8e5bf029e9f797bc21cd474fffed 25-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread

Merge commit 'd335f9a90375db18b2f77f22f62379ac2d257384'

* commit 'd335f9a90375db18b2f77f22f62379ac2d257384':
Negatively cache settings and proactively slurp settings into cache.
f366a9b007909cc6d214fbee26a97e880734a094 25-Aug-2010 Brad Fitzpatrick <bradfitz@android.com> Negatively cache settings and proactively slurp settings into cache.

The settings database cache is tiny (or should be tiny) and can be
slurped into memory. Once it's in memory and we know we have it all
we can avoid going to disk at all for keys not in the cache.

This is a big percentage of the StrictMode violations & latency.

Change-Id: I649411be0c40d348f58376ccfb3eda059fd69fbc
rc/com/android/providers/settings/SettingsProvider.java
02e18d4d4eed949da02fd8aa87801858d99b902a 25-Aug-2010 Christopher Tate <ctate@google.com> Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
09dedc998f71c02833950c6476e4d3091c25a8ba 25-Aug-2010 Christopher Tate <ctate@google.com> Make the default backup configuration "disabled; local transport selected"

By default out of the box, an Android build will have the backup mechanism in
its "disabled" state and pointed to the LocalTransport test transport. We
do not want retail devices built without the Google backend to have backup
enabled out of the box; it would cause them to gradually grind away the
cache partition for no good reason. On those devices with this change,
developers would need to enable backup manually (possibly using the normal
Settings UI; more probably using the 'bmgr' shell tool), but would no longer
also have to manually configure the active transport name.

Device vendors producing Google-enabled products will simply use resource
overlays to configure the default state and transport name for their builds.
When building a product that points to the Google backup transport by default,
the "def_backup_enabled" boolean resource should still be set to 'false' --
the Google backup disclosure activity supplied by GSF will take care of
enabling the backup services if the user opts in to it. (Basically, vendors
will never have to overlay the def_backup_enabled resource -- the default
value of 'false' is correct for any retail device regardless of whether it
can use the Google backup transport.)

In the SDK build, the default transport will remain the local one, but
the default enable state overridden and set to "true". This is the ideal
situation for developers: all aspects of the backup mechanism immediately
operative with no manual configuration needed.

Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34
es/values/defaults.xml
7e84159f5f79835c6ae82bc6b4d8ef4bf131496f 21-Aug-2010 Doug Zongker <dougz@android.com> am 36c051c7: am a695cbc9: am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno

Merge commit '36c051c717391afe12a1fe8163960286175f2f7e'

* commit '36c051c717391afe12a1fe8163960286175f2f7e':
make android_id random seed depend on time as well as ro.serialno
a695cbc94355017d02a3a6c17d866776a8eee24c 19-Aug-2010 Doug Zongker <dougz@android.com> am 0fe27cf5: make android_id random seed depend on time as well as ro.serialno

Merge commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc' into gingerbread

* commit '0fe27cf5bd1407bc7b4eabefaa91ff535582badc':
make android_id random seed depend on time as well as ro.serialno
0fe27cf5bd1407bc7b4eabefaa91ff535582badc 19-Aug-2010 Doug Zongker <dougz@android.com> make android_id random seed depend on time as well as ro.serialno

Change-Id: I0a48aacd8da30896d91fa05b7791335e6ed751e5
rc/com/android/providers/settings/SettingsProvider.java
4203c1e56c308d2e2650512d2c2d567008079a92 19-Aug-2010 Eric Fischer <enf@google.com> Import Romansh translations.

Change-Id: I798cc041fc1d93c3e51a1598a80781453229a523
es/values-rm/strings.xml
e339464f1c8efe7e53b761cf44ff5be6e537ecad 13-Jul-2010 Dianne Hackborn <hackbod@google.com> am 1bcb6658: Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo

Merge commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552' into gingerbread

* commit '1bcb665825dc97789e8c1b892ec4298fd0b8c552':
Fix issue #2834005: Android Settings.Secure bypass
24117ce3ae32c40798d2d9bda80675814f76730d 13-Jul-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2834005: Android Settings.Secure bypass

Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
8932020f542ae6dd4750fa823bbf2d2bcf504267 25-Jun-2010 Joe Onorato <joeo@android.com> Fix the notification vibration setting and add a test app that lets you recover from the busted
state.

Bug: 2767349
Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
rc/com/android/providers/settings/DatabaseHelper.java
2b32afd07da2319c4d55624332cee1a43a56cf47 22-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 5ebaf106: merge from open-source master

Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken

* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
Fix broken logic in SettingsProvider.parseProviderList.
5ebaf10693725c9dc48219c3c65945b84d74692f 22-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
bdc7f891cf47c077c26ef418dbea23c04820c152 22-Apr-2010 Mike Lockwood <lockwood@android.com> Fix broken logic in SettingsProvider.parseProviderList.

We were accidentally stripping both leading and trailing commas
when removing a provider from the enabled provider list.

Signed-off-by: Mike Lockwood <lockwood@android.com>
rc/com/android/providers/settings/SettingsProvider.java
61f280d520fa83522d9d7a54e19add1cfee91917 13-Apr-2010 Amith Yamasani <yamasani@google.com> am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo

Merge commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3' into kraken

* commit 'feb976e6be3a07dd31b35b35287420bba9ffbbf3':
Fix an upgrade bug in SettingsProvider.
cd66caf015d18baa03a86796649550cb65cd99ea 13-Apr-2010 Amith Yamasani <yamasani@google.com> Fix an upgrade bug in SettingsProvider.

Bug: 2569112

Wrong usage of local method.

Change-Id: I9d7c68baa7cf8dd2b7e4345555c1edc374de94e6
rc/com/android/providers/settings/DatabaseHelper.java
3e543abbc18eec03ba7300b53cd65dc1c30fd40b 08-Apr-2010 Suchi Amalapurapu <asuchitra@google.com> am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo

Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken

* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
Fix 2579461
40e472521a544f26cb6956995788f7c36fff1404 08-Apr-2010 Suchi Amalapurapu <asuchitra@google.com> Fix 2579461
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
0e19e2b265dd783d82c71e1ac8aa6637ee8c9844 31-Mar-2010 Amith Yamasani <yamasani@google.com> am e1331779: am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo

Merge commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken

* commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5':
Fix for Never not existing in latest timeout values.
b6e6ffae3564f0c8935cd2d307ffa4d17c57f992 30-Mar-2010 Amith Yamasani <yamasani@google.com> Fix for Never not existing in latest timeout values.

Bug: 2535288

Change-Id: I15ca60c7afe58fbe57e557e6d0028dc200d8b322
rc/com/android/providers/settings/DatabaseHelper.java
1f4df90bfab8ca42eabe95f19eadff3432eee7fd 27-Mar-2010 Oscar Montemayor <oam@google.com> DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
ndroidManifest.xml
cc84c69726507a85116f5664e20e2ebfac76edbe 29-Mar-2010 Christopher Tate <ctate@google.com> API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

Part of bug #2545514

Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
rc/com/android/providers/settings/SettingsBackupAgent.java
89206fdb3b75a8bc12ac75fc8a95a5c9c79c3220 22-Mar-2010 Vasu Nori <vnori@google.com> close SQLiteStatement objects in finally block

unclosed SQLiteStatement objects cause finalizer warnings.
nix them by closing this object in finally block.

Change-Id: Iea86ff169f935bb743aa0c32aa4aeb0cb4fcd4ad
rc/com/android/providers/settings/DatabaseHelper.java
35f480eb06b12e4636fd84ad8cfc38c49cd9e46a 18-Mar-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: Id1a0d62dc917937fc14ccab26eb7bd2c2148137e
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
dca5f191ace4bc52fbc6d4ed80a7e40ccb698422 12-Mar-2010 Ken Shirriff <kens@google.com> Close db statement.

Fix finalizer error bug 2483608

Change-Id: I49c33dc68cd3f24772990a467790ecaa06e13a18
rc/com/android/providers/settings/DatabaseHelper.java
089262dc022d87e31eefc536025be6c015c7ebde 10-Mar-2010 Suchi Amalapurapu <asuchitra@google.com> Dont include code size for apps on sdcard.
Use constants defined in PackageHelper for user preferences
to install auto, internal, external.
Set default install location to external.
Update settings db version number

Change-Id: Ib5110c9377990e20a48cee923e55898dfddfd1e6
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
1c7fa4836bfa7ff61f176461ca0557e90f714121 10-Mar-2010 Daniel Sandler <dsandler@google.com> Add VIBRATE_IN_SILENT to the settings database & backup.

Change-Id: Id31e24ef0536278ccb66b22bba7ed2b47eb1a371
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
547a96bc12f25f585271c678395d4c991f08c52d 10-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> SettingsProvider: dup-suppress from cache.

On insert(), check to see if the value is redundant by checking if
it's the same value already in our cache (but without faulting it in
to check). If so, avoid hitting sqlite or spamming all the
notification listeners with such uselessness.

This reportedly is happening a fair bit.

Change-Id: If58feb3ff1d00027dd927e0900087388cbcd72ae
rc/com/android/providers/settings/SettingsProvider.java
342984a17ddd010381c462066e33e18354b79e4f 10-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> SettingsProvider: defensively cap size of settings kept cached in memory.

Change-Id: I50289ece2d7f5f50d2ea2efbacac7a0bb1483bf6
rc/com/android/providers/settings/SettingsProvider.java
f02811f7853202c0934622702ebb9c82e6ab0592 10-Mar-2010 Romain Guy <romainguy@android.com> Support unbundled bookmarks.
Bug #2460685

Change-Id: I402e342673cd8de88664a595401a141e09583e1d
tc/Android.mk
tc/bookmarks.xml
es/xml/bookmarks.xml
rc/com/android/providers/settings/DatabaseHelper.java
1bd62bd3ca4d098196e91b43799d4010c1d26623 09-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Cache hot settings in-memory in the SettingsProvider.

This brings down Settings lookups to 0.5 ms on sholes. (down from
~10.5 ms originally, and ~2.5 ms after the ContentProvider.call()
interface)

Change-Id: Ibde7c3d21e0b0e5714714a2075f314726edfc19d
rc/com/android/providers/settings/SettingsProvider.java
156c43545529fb3d731ffdd9c4514d38758e3f06 06-Mar-2010 Amith Yamasani <yamasani@google.com> Move lockscreen settings to secure table to prevent tampering. b/2343673

Migrate old settings to secure on upgrade.
rc/com/android/providers/settings/DatabaseHelper.java
8c9233fba2d73ed9f9cfe38a9be6294c3da2a3ca 08-Mar-2010 Daniel Sandler <dsandler@google.com> Correct path to LowBattery.ogg.

Bug: 2320026
Change-Id: Idede20701c5a3d0e60bd327a869b1adf1577db21
es/values/defaults.xml
4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3 06-Mar-2010 Christopher Tate <ctate@google.com> Refactor android.backup => android.app.backup

Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
1877d0158b529663b8315482e7346a7bcaa96166 05-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Add "call" method on ContentProvider.

This permits implementing interfaces which are faster than using
remote Cursors. It then uses it for Settings & SettingProvider, which
together account for ~50% of total ContentProvider event loop stalls
across Froyo dogfooders.

For fetching Settings this looks like it should reduce average
Settings lookup from 10 ms to 0.4 ms on Sholes, once the
SettingsProvider serves most gets from in-memory cache. Currently it
brings the Sholes average down from 10ms to 2.5 ms while still using
SQLite queries on each get.
rc/com/android/providers/settings/SettingsProvider.java
03b6d90db9acc531a945c57795b903a3b74dd0b7 26-Feb-2010 Christopher Tate <ctate@google.com> Make sure to apply the auto-restore setting when the system is restored

Change-Id: If2e09d6b4e65c75e7e90754adc2425fa73d2602a
rc/com/android/providers/settings/SettingsHelper.java
2269d1572e5fcfb725ea55f5764d8c3280d69f6d 25-Feb-2010 Dianne Hackborn <hackbod@google.com> Re-arrange android-common so framework no longer links with it.

This is the framework part, moving classes around so the framework
no longer needs to link to android-common. Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
rc/com/android/providers/settings/DatabaseHelper.java
00f58438bdb506d84015df45b5b3ff1594aab1d2 24-Feb-2010 Eric Fischer <enf@google.com> Filenames of sound effects are not translatable.
es/values/defaults.xml
63e1d264a751519b465f9be84f648d338a095cd1 24-Feb-2010 Daniel Sandler <dsandler@google.com> Turn off lock screen sounds by default.

This change also fixes a typo that was suppressing the dock
sounds. But: so as not to surprise anyone, this change
defaults dock sounds off as well. Will need to add UI
somewhere to turn them on (Spare Parts?).

Bug: 2465483
Change-Id: Ic2cccb416d5616a84363debb740bf5897f0831c4
es/values/defaults.xml
f1cbfff03ac53be9475f419d16a2e79b6c28a494 23-Feb-2010 Oscar Montemayor <oam@google.com> Fix bug when adding SET_INSTALL_LOCATION to SettingsProvider database, upgrade path.
rc/com/android/providers/settings/DatabaseHelper.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa 20-Feb-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2438980: Implement package watcher for voice recognizer service setting

I am getting tired of writing package monitor code, realized this is missing in
a number of places, and at this point it has gotten complicated enough that I
don't think anyone actually does it 100% right so:

Introducing PackageMonitor.

Yes there are no Java docs. I am still playing around with just what this
thing is to figure out what makes sense and how people will use it. It is
being used to fix this bug for monitoring voice recognizers (integrating the
code from the settings provider for setting an initial value), to replace
the existing code for monitoring input methods (and fix the bug where we
wouldn't remove an input method from the enabled list when it got
uninstalled), to now monitor live wallpaper package changes (now allowing
us to avoid reverting back to the default live wallpaper when the current
one is updated!), and to monitor device admin changes.

Also includes a fix so you can't uninstall an .apk that is currently enabled
as a device admin.

Also includes a fix where the default time zone was not initialized early
enough which should fix issue #2455507 (Observed Google services frame work crash).

In addition, this finally introduces a mechanism to determine if the
"force stop" button should be enabled, with convenience in PackageMonitor
for system services to handle it. All services have been updated to support
this. There is also new infrastructure for reporting battery usage as an
applicatin error report.
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
ef6b22fc04a8d5ab26e13efac8069c097e0da7c9 17-Feb-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2420412: API review: DeviceAdmin API changes

Note in docs that callbacks are on main thread.
Rename to DeviceAdminReceiver?
Document resetPassword is the device's password.

Also hide android.R.attr.neverEncrypt.
ndroidManifest.xml
0e9d2af2d60b381ba52d0c25e583b3d2a9906051 25-Jan-2010 Daniel Sandler <dsandler@google.com> New user interface sound effects:

- Low battery. (http://b/2320026)
- Dock/undock events.
- Keyguard lock/unlock events.

New system settings have been created to turn these on/off
and to specify the relevant sound files.

[Production notes: The provided low battery sound and dock
sounds were synthesized; the lock screen sounds are
processed samples of a ballpoint pen click mechanism.]

Bug: 2320026
Change-Id: I374285b0f94f59c7555bb8816580f5a8c802e90d
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
cf36010357b0e106e600c953437e6375b3e65fcb 13-Feb-2010 Chris Tate <ctate@android.com> Merge "Remove BACKUP_DATA permission and associated checks"
a87240c2270e83c3e865ffa1e56f79bfa74daffc 12-Feb-2010 Christopher Tate <ctate@google.com> Remove BACKUP_DATA permission and associated checks

Any package can now participate in backup/restore, without requiring any
manifest-declared permission. *Control* of the backup manager is still
guarded by the BACKUP permission, which is signatureOrSystem.

Change-Id: I116fcfcd4cd255e3c976330da1c4dea7d4faae9d
ndroidManifest.xml
6176677e01964cb5751ff217c091571ce6a8b5fb 12-Feb-2010 Jim Miller <jaggies@google.com> Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader.

This should give us the ability to diagnose and fix db upgrade errors as reported by partners and end users.
rc/com/android/providers/settings/DatabaseHelper.java
cb0be8a530d6fefdb05f009980c029c4da14bf98 12-Feb-2010 Mike LeBeau <mlebeau@android.com> Use the new RecognitionService.SERVICE_INTERFACE instead of
RecognizerIntent.ACTION_RECOGNIZE_SPEECH when finding a voice
recognition service.
rc/com/android/providers/settings/DatabaseHelper.java
5d34e9b63d5305934dcedac11e8dd658ae23c174 11-Feb-2010 Mike LeBeau <mlebeau@android.com> Add new setting for the ComponentName of the service to be used
for voice recognition on the device. Right now this just queries
the package manager at boot and finds the (hopefully) single
available recognizer.

TODO: Add an attribute to let recognition services expose a settings
activity, and expose the settings activity of the chosen recognition
service in the system settings for voice input & output.
rc/com/android/providers/settings/DatabaseHelper.java
a9c1625e71ddd7a9cdaf9d1720be8c58e4809fa6 10-Feb-2010 Suchi Amalapurapu <asuchitra@google.com> Set default value for default install location
rc/com/android/providers/settings/DatabaseHelper.java
117818e4f171b1fd9daa05349c48f61388f04567 09-Feb-2010 Suchi Amalapurapu <asuchitra@google.com> Add new manifest option for install location
Change recommendAppInstallLocation api
add code to parse new attribute.
Define flags in PackageInfo
Add new settings attributes for enabling setting and value for install location
Some tests
The policy for install location: if explicitly set in manifest as internal only we try to install the app only on internal storage. if set to preferExternal, we try to install it on sdcard if possible. If not we fall back to internal.
If the user enables setting SET_INSTALL_LOCATION(which will always
be set to false in final release builds) and sets a prefered location, we try
to honour it.
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
4f8ff39c1e2448d44ac900e04f9348f9d2aeaaf5 03-Feb-2010 Doug Zongker <dougz@android.com> use device serial number to seed RNG for generating ANDROID_ID

Change-Id: I1bcc55f1309cb908803bc42084846a046041eda6
rc/com/android/providers/settings/SettingsProvider.java
9327f4f671de3cbb795612bf4f314ceff88de865 29-Jan-2010 Dianne Hackborn <hackbod@google.com> More device policy work: clarify password modes, monkeying.

Clarifies what the password modes mean, renaming them to "quality"
and updating their documentation and the implementation to follow.

Also adds a facility to find out if a monkey is running, which I
need for the api demo to avoid letting it wipe the device.
rc/com/android/providers/settings/DatabaseHelper.java
e79f721e710166b6fd57fd101de84367156b77b7 22-Jan-2010 Ken Shirriff <kens@google.com> Remove unused providers

bug 2388178
rc/com/android/providers/settings/SettingsHelper.java
df83afaf299666e99c519aa86e7e082b7c116e95 20-Jan-2010 Dianne Hackborn <hackbod@google.com> More device policy manager / admin work.

Update API with some new features, re-arrange how you check for valid
passwords, and start hooking up the back-end implementation.
rc/com/android/providers/settings/DatabaseHelper.java
31f90b62e8c83270094f5b0b4c75a0e06d72cd75 20-Jan-2010 Jim Miller <jaggies@google.com> Fix 2385283: Add DevicePolicyManager calls to LockScreen.
rc/com/android/providers/settings/DatabaseHelper.java
87734d3bc118cba8f42845ddd51f10edadb84abf 08-Jan-2010 San Mehat <san@google.com> Settings: Add settings for MountService prefs and bump DB version to 46

Adds 4 new Settings:
Secure.MOUNT_PLAY_NOTIFICATION_SND - Play notification sound on events
Secure.MOUNT_UMS_AUTOSTART - Auto-start UMS when host detected
Secure.MOUNT_UMS_PROMPT - Show notification when host detected
Secure.MOUNT_UMS_NOTIFY_ENABLED - Show notification while UMS enabled

These settings are also added to the Settings backup list

Signed-off-by: San Mehat <san@google.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
698893fc902b0510d45864e4d221d01eec508386 08-Jan-2010 Eric Fischer <enf@google.com> Merge "Update with latest translations."
aed8f8eb1491a21c8c71d39258b70edb74533a62 08-Jan-2010 Doug Zongker <dougz@android.com> remove Settings.Gservices

Move the last few keys to secure settings, and delete the Gservices
table.

Change-Id: Ie3ba45aa8c1f220824aa027c547cb82884452eb5
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
d22c49a2d5321682496e7ca349686d365b76994e 08-Jan-2010 Eric Fischer <enf@google.com> Update with latest translations.
es/values-da/strings.xml
edc5189c33de03f3e2f5f73edc0e007992b933c9 07-Jan-2010 Doug Zongker <dougz@android.com> change remaining frameworks/base Gservices to Secure settings

Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
rc/com/android/providers/settings/SettingsProvider.java
432bff01ec67533dbbb6ed27cb190c99e83ea226 06-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Do not use a user tag on apps, as it is ignored.

The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885
ndroid.mk
a0b517609dfd8436a98bdebb31466f19ffec6cb5 28-Dec-2009 Eric Laurent <elaurent@google.com> am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.

Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
f0108cda21bec61418b24aa6217406072780b5d5 22-Dec-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of ad2fa35d to master

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
484d2888680e18e6ad8c3fcc51e3b70a705a096e 08-Dec-2009 Eric Laurent <elaurent@google.com> Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.

Add a separate system settings entry for bluetooth SCO volume.
rc/com/android/providers/settings/DatabaseHelper.java
d4a4729c0cac582a2dcec7c8cfb316b81885a0f0 21-Dec-2009 Tom Taylor <tomtaylor@google.com> Update imports to android-common

Several files were moved to android-common. Update all the references
to import those files from the new location.
rc/com/android/providers/settings/DatabaseHelper.java
23c279d522a9dfa35c369054373e78b1ef7cacec 17-Dec-2009 Fred Quintana <fredq@google.com> am bc1c8847: am 66cc5900: Merge change Ic70239e8 into eclair-mr2

Merge commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0'

* commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0':
changed SettingsProvider to manage the androidid itself
c70239e84d5024c65728ba74fe74c7394b34ac65 17-Dec-2009 Fred Quintana <fredq@google.com> changed SettingsProvider to manage the androidid itself
rc/com/android/providers/settings/SettingsProvider.java
9ce13a39932bbb61723e23f23646e00fc2b6568e 03-Dec-2009 Amith Yamasani <yamasani@google.com> am 1224b101: am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair

Merge commit '1224b1016d2a4ec172f13741e632e59c7528b319'

* commit '1224b1016d2a4ec172f13741e632e59c7528b319':
Add new setting for notification light pulsing. Bug #2238250
42c4c589003c029309c823e8f06ed00b3cdb21de 02-Dec-2009 Amith Yamasani <yamasani@google.com> am a9791d30: Merge change Iae3ed706 into eclair

Merge commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2

* commit 'a9791d304b8ec03e04ad4533b1820a64794e1bcc':
Add new setting for notification light pulsing. Bug #2238250
ae3ed706702a5ebe6ffcc08b941b1401c9a24b89 02-Dec-2009 Amith Yamasani <yamasani@google.com> Add new setting for notification light pulsing. Bug #2238250

New System setting and code to set the defaults on upgrade.
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
a8529f68671a8a118751cb6ad577f44eaf076b96 18-Nov-2009 Oscar Montemayor <oam@google.com> Encrypted File Systems Project. Installer modifications.
Started to modify isntaller for data redirection to a secure location.
ndroidManifest.xml
bd5b099c25eca35f1c0f5380534ed848e8c01b6c 14-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-da/strings.xml
dc3494e3d8e17aeb0dbbe41953a5ef763d95ff78 15-Oct-2009 Mike Lockwood <lockwood@android.com> Remove PowerManager.setAutoBrightness()

We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
rc/com/android/providers/settings/SettingsHelper.java
28a1b67a1ce87909a7afce6015753a8801c97bc6 01-Oct-2009 Daniel Sandler <dsandler@google.com> Remove unneeded icon.

(Obviated by commit a408791148e816215f65ad81a187051c5fb47c68.)

Change-Id: I6e01fa52f2bbeb28c969e6a033ab0b1032cbc848
es/drawable/ic_launcher_settings.png
13f4a64ddd0d81ffa04cb2ff4fd4c6500d6d21ed 01-Oct-2009 Christopher Tate <ctate@android.com> Turn off the last of the STOPSHIP verbose debugging

Change-Id: Id93f4c9e9fb8468a554ae1e5c5c767f72903662c
rc/com/android/providers/settings/SettingsBackupAgent.java
436344ae12c819f58306ceb94241a266141e1218 01-Oct-2009 Christopher Tate <ctate@android.com> Turn off most of the backup-related debug logging

The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
rc/com/android/providers/settings/SettingsBackupAgent.java
2d4deb11e14ce8afae92625747bedeb668621f17 30-Sep-2009 Mike Cleron <mcleron@google.com> Placeholder mdpi assets
es/drawable-mdpi/ic_launcher_settings.png
a408791148e816215f65ad81a187051c5fb47c68 30-Sep-2009 Mike Cleron <mcleron@google.com> Newer icons
es/drawable-hdpi/ic_launcher_settings.png
ee9b30d3947f0abc5c84f2a55dd5e2d200a7c7cd 29-Sep-2009 Mike Cleron <mcleron@google.com> New icons
es/drawable-hdpi/ic_launcher_settings.png
es/drawable/ic_launcher_settings.png
141e4f1d69186104c3e169ee7365b62bc425859a 27-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 27177 into eclair

* changes:
Add auto-brightness mode to the list of backed-up settings
075a18d607c3aa8386b4d06aea22f4bfacbe447b 26-Sep-2009 Dianne Hackborn <hackbod@google.com> Turn on haptic feedback by default.

Change-Id: I85efeca1a0aca91992e28236077c668e0d14cbbb
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
362aca60453ec7f27abb4d83fc29dd82095dc882 26-Sep-2009 Christopher Tate <ctate@android.com> Add auto-brightness mode to the list of backed-up settings

Change-Id: I4302b79691ed717d810748b239311cba198f6381
rc/com/android/providers/settings/SettingsHelper.java
796e0f0ed531b7ff9922cd632d70d8f1da8f5829 22-Sep-2009 Christopher Tate <ctate@android.com> Don't restore any setting that we don't think should be backed up

The ad-hoc blacklist has been replaced by a check that whitelists each restored
datum against the set of keys that we actually back up. Keys read from the
restore data which are not found in the whitelist are not applied.

Also adds in some more debugging output, marked to be disabled for ship.
rc/com/android/providers/settings/SettingsBackupAgent.java
bfe319e06aa56c081d0d94d64a8181291d7f7388 21-Sep-2009 Dianne Hackborn <hackbod@google.com> Turn animations on by default.

Add API to skip the animation for a particular start activity, so that
a latter better one can be used.

Fix Theme.NoDisplay to actually work.

Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.

Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).

Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
a286f419084d56217f05a64f1d24c9e07917212e 19-Sep-2009 Christopher Tate <ctate@android.com> Don't back up / restore certain sync-related settings

In particular, this no longer attempts to back up the on/off state of specific
backend syncing [gmail/contacts/calendar], nor the "background data" toggle.
The former was causing a great deal of spurious trips through backup as the
notification was being tickled during general sync operation, and the latter
makes little sense at restore time.

Fixes these issues:

b/2097613 - frequent "backup_data_changed" messages in event log
b/2131662 - should not backup background data, master sync settings
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
237a29923a05663a2195bf93b392768dbaf31ebf 15-Sep-2009 Mike Lockwood <lockwood@android.com> Move backlight brightness from HardwareService to PowerManager

to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming

Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
rc/com/android/providers/settings/SettingsHelper.java
951764b97010dfa073126f52b43ea1bdf1b35998 27-Aug-2009 Dan Murphy <D.Murphy@motorola.com> Add automatic lighting control framework

Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.

These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.

If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.

Change-Id: I146a6d75b99b08c9b839218ce6b85adf21f9fd73
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
0738e8893540e8f7fac7c193be5fe24b67f04672 12-Sep-2009 Christopher Tate <ctate@android.com> Don't backup/restore telephony material from secure settings

* Remove several nonportable telephony settings from the set to be included in
the backed-up dataset

* Explicitly ignore those settings if they're encountered during a restore
operation, so that we don't inadvertently do things like configure a GSM
phone to use CDMA logic.
rc/com/android/providers/settings/SettingsBackupAgent.java
2cfab8445851c59f7da07d81645ece8d70e8ce28 10-Sep-2009 Amith Yamasani <yamasani@google.com> Save and restore partial supplicant data, not the whole file.

This makes it compatible between different device types with different
wifi chipsets.
rc/com/android/providers/settings/SettingsBackupAgent.java
f186055a53758fd4112ab3c470cda6337a18fa33 10-Sep-2009 Jim Miller <jaggies@google.com> Fix for bug # 2023074: settings db updater broken at version 34.
rc/com/android/providers/settings/DatabaseHelper.java
5cacfb9df2eadc439052ea26c9d67a89376d2b31 09-Sep-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
5e1ab335e6e8fbfa19c64d53880a22f472010953 02-Sep-2009 Christopher Tate <ctate@android.com> Expand apps' control over the settings restore process

Applications can now specify two more aspects of the restore process: whether
they need to run with their own custom Application subclass rather than being
launched in the usual restricted mode during restore, and whether it's okay for
the backup manager to kill the app process once restore has completed. The new
manifest attributes for these are, respectively, android:restoreNeedsApplication
and android:killAfterRestore.

If unspecified in the manifest, restoreNeedsApplication is false, and
killAfterRestore is true.

In order to support kill-after-restore cleanly, this change also adds a new
system-process-only interface to the Activity Manager, which will schedule a
"commit suicide" event on the target app's main thread looper.

The framework backup agents have been given the appropriate new backup
attributes as well.
ndroidManifest.xml
02901eb7f21751b8a9486ffa9f50531bd59133a2 26-Aug-2009 Mike Lockwood <lockwood@android.com> SettingsProvider: Fix botched merge from donut to eclair.

donut and eclair had different ideas of what it means to upgrade from verion 34 to 35.

Signed-off-by: Mike Lockwood <lockwood@android.com>
rc/com/android/providers/settings/DatabaseHelper.java
bd022f423a33f0794bb53e5b0720da2d67e4631c 15-Aug-2009 Nick Pelly <npelly@google.com> Bluetooth: API change.

Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
rc/com/android/providers/settings/SettingsBackupAgent.java
0749dcd19301fe4093f9cf8677c722d17bceabfb 14-Aug-2009 Christopher Tate <ctate@android.com> Backup participants must now hold the BACKUP_DATA permission

Packages that do not use android.permission.BACKUP_DATA will neither be backed
up nor restored. That permission is currently signature-only. In the future if
access to the backup/restore infrastructure is made available to arbitrary 3rd
party applications, the permission checks (and indeed, the permission itself)
can simply be removed.
ndroidManifest.xml
92c1752175f0880a0e0a05fdca37b54a8fb2b52d 08-Aug-2009 Christian Sonntag <cxs@android.com> Change WIFI key
rc/com/android/providers/settings/SettingsBackupAgent.java
c5b5b0fb94d078148b5fe5f6b8bb4ee361949f3e 07-Aug-2009 Christian Sonntag <cxs@android.com> Retain state of wifi connection after restore
rc/com/android/providers/settings/SettingsBackupAgent.java
4880575bacd9f49d864e8b61efca8cdeb231895c 05-Aug-2009 Jim Miller <jaggies@google.com> Fix error in settings.db upgrader. See bug 1999477 for details.
rc/com/android/providers/settings/DatabaseHelper.java
bd5ddf01e4d629982fa8bb667d4be7c5ec3aa79f 30-Jul-2009 Mike Lockwood <lockwood@android.com> Wifi: Add support for enabling Wifi while in airplane mode.

If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
e406906e16bf31bdd0064b8d47df5b177e8e8550 29-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8878

* changes:
Support for selection of silent ringtone from the ringtone picker. This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
69f593ccb7414ee98991b1da1a4bfbd9951e3570 28-Jul-2009 Marco Nelissen <marcone@google.com> Support for selection of silent ringtone from the ringtone picker.
This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
rc/com/android/providers/settings/SettingsProvider.java
f7573bd2b7bb63d78fa8f0003ba49be10b128753 28-Jul-2009 Eric Fischer <enf@google.com> resolved conflicts for merge of cdb9e971 to master
2bfe11af6f715656b60fc9ac4566e74da9b98390 28-Jul-2009 Eric Fischer <enf@google.com> Mark the the airplane mode internal strings as not translatable.

Bug 2017552
es/values-cs/defaults.xml
es/values-cs/strings.xml
es/values-de/defaults.xml
es/values-de/strings.xml
es/values-es/defaults.xml
es/values-es/strings.xml
es/values-fr/defaults.xml
es/values-fr/strings.xml
es/values-it/defaults.xml
es/values-it/strings.xml
es/values-nl/defaults.xml
es/values-nl/strings.xml
es/values-pl/defaults.xml
es/values-pl/strings.xml
es/values-zh-rTW/defaults.xml
es/values-zh-rTW/strings.xml
es/values/defaults.xml
a553c25b33c99b345cf1c8688f8df0ed8df14e5a 17-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 1795088 Improve audio routing code

Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
rc/com/android/providers/settings/DatabaseHelper.java
07bca345514d4d20aab4e83a00cce2311a72b2fc 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 9db0d36c: Merge change 7600 into donut

Merge commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f'

* commit '9db0d36c6141d8e0ccf6ca6c450872f03b55c15f':
Update youtube bookmark
82887f079f7755e72f5f6fcad4ece3f92702e6c5 17-Jul-2009 Jim Miller <jaggies@google.com> Update youtube bookmark
tc/bookmarks.xml
1dcdce6db705a882c6e752d00f8b89805e9968b8 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am c353268c: Merge change 6968 into donut

Merge commit 'c353268c20a8ea425ac9f1e328684855cfc805e0'

* commit 'c353268c20a8ea425ac9f1e328684855cfc805e0':
Import new translations
0560209bcdc21b0c708d7947edf8e2d07c2c170d 14-Jul-2009 Eric Fischer <enf@google.com> Import new translations
es/values-cs/defaults.xml
es/values-cs/strings.xml
es/values-de/defaults.xml
es/values-de/strings.xml
es/values-es/defaults.xml
es/values-es/strings.xml
es/values-fr/defaults.xml
es/values-fr/strings.xml
es/values-it/defaults.xml
es/values-it/strings.xml
es/values-nl/defaults.xml
es/values-nl/strings.xml
es/values-pl/defaults.xml
es/values-pl/strings.xml
es/values-zh-rTW/defaults.xml
es/values-zh-rTW/strings.xml
c6f81c6716c634317c69343fc2fd9a2fe6a2c034 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am d1e5e3ff: Merge change 6639 into donut

Merge commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368'

* commit 'd1e5e3ffc22478bad8525dec4f1c6d57fe0ad368':
Restore audio settings and wifi.
d158214511a3c04753de04fa6389e46d33135c38 09-Jul-2009 Amith Yamasani <yamasani@google.com> Restore audio settings and wifi.

Optimize backups by writing an entity only if the checksum of the data has changed.
Call into the hidden AudioService API to apply changed audio settings.
After restoring wifi data, make sure that the permissions and ownership are set
properly for the supplicant process to access it.
Locale isn't restoring properly - TODO added.
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
2eac99ccbcdcc91b69c04ea2eb03f4cba961c17c 08-Jul-2009 -b master <yamasani@google.com> resolved conflicts for merge of d6fe243c to master
8823c0a8c68fe669c21c539eef9fc6541f0c7494 07-Jul-2009 Amith Yamasani <yamasani@google.com> Backup / Restore locale preference.

Also backup development settings MOCK_LOCATION and USB_DEBUGGING.
Backup and restore more of the Audio settings. Won't work yet without a reboot.
Disable Wifi supplicant restore temporarily. It seems to be disabling Wifi due to
permissions problems.
Don't restore Ringtones.
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d 07-Jul-2009 -b master <yamasani@google.com> resolved conflicts for merge of b7195159 to master
70c874ba20b586712a7550b6c5efeb6dc0fdf9fa 06-Jul-2009 Amith Yamasani <yamasani@google.com> Restore GPS state and ringer/vibrate toggles.

Inform backup manager when sync flags change. Set ringer/vibrate mode.
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
d719890cab1eec09cbf556a3b86cc02b0f0ef8d7 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6285

* changes:
Make backup agent run in the system process as well.
344bf682c9b7d3799851cb9ce3eeecfd4cec23f4 02-Jul-2009 Amith Yamasani <yamasani@google.com> Make backup agent run in the system process as well.
ndroidManifest.xml
47873e55268eb636b2f9ada0266a0b60f52ca365 02-Jul-2009 Amith Yamasani <yamasani@google.com> 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.
rc/com/android/providers/settings/SettingsBackupAgent.java
501eec92f9f4f206ad7972c63f2d0ef0285d8e34 06-Jul-2009 -b master <yamasani@google.com> Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"

This reverts commit f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
ndroidManifest.xml
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
f8e3ba5bfad14f3037d72eb6243258c13169cbd8 03-Jul-2009 The Android Open Source Project <initial-contribution@android.com> hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again
ndroidManifest.xml
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
133ec72f2480a65a02c8e1e5d9540796a0d05895 03-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 288fe16c: Merge change 6043 into donut

Merge commit '288fe16c20e2c20556839046d38c487b0b18735c'

* commit '288fe16c20e2c20556839046d38c487b0b18735c':
System and Secure settings backup.
575d1af980f4b4866325bfc487455f54606cf49e 03-Jul-2009 The Android Open Source Project <initial-contribution@android.com> resolved conflicts for merge of cf098294 to master
426cc625980b39114f2adaddc6e21f70b7ee972e 02-Jul-2009 Amith Yamasani <yamasani@google.com> Make backup agent run in the system process as well.
ndroidManifest.xml
16d79e56ca3fe7606c48882d9b1aef6267d69124 02-Jul-2009 Amith Yamasani <yamasani@google.com> 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.
rc/com/android/providers/settings/SettingsBackupAgent.java
220f4d633be1098e7887dbd06f179138bf19f1ad 02-Jul-2009 Amith Yamasani <yamasani@google.com> System and Secure settings backup.

This backs up the basic system and secure settings. THe restoration doesn't
take effect immediately. You many need to restart the runtime to see all
restored values take effect.
ndroidManifest.xml
rc/com/android/providers/settings/SettingsBackupAgent.java
rc/com/android/providers/settings/SettingsHelper.java
rc/com/android/providers/settings/SettingsProvider.java
cf098294da7a820d5c30d8ed2006ed5446ee1da9 02-Jul-2009 Dianne Hackborn <hackbod@google.com> 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.
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
bcab8df83e6e769a7cbcc742e72b47d665998793 25-Jun-2009 Mike Lockwood <lockwood@android.com> Settings: Add preference to enable/disable assisted GPS.

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
b3222875943efba066896c140b7cf7d58b423870 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 60a0ad65: Merge change 5329 into donut

Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
frameworks/base - CDMA settings additions
d0f6715dcb68fbcee12e0c73326c8d872cb9c5a4 14-Jun-2009 David Krause <david.krause@motorola.com> frameworks/base - CDMA settings additions

These changes are the frameworks/base portion of CDMA UI changes.

Five settings are added:
- In-call DTMF type (burst or long)
- Emergency tone type
- CDMA auto-retry
- Hearing Aid Compatibility (on/off)
- TTY mode
rc/com/android/providers/settings/DatabaseHelper.java
6976dca6c89d4d3ff986e46b6eedebdbdd656b0c 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 6afe8133: Merge change 4720 into donut

Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'

* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
Fix string formatters in SettingsProvider SecurityException message.
6afe81339ed973f1ef4a6c30110d5ce3b001ea4c 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4720 into donut

* changes:
Fix string formatters in SettingsProvider SecurityException message.
31a88fac91cbdddb2ba63b0557cfd18b31d5eaac 19-Jun-2009 Brett Chabot <brettchabot@android.com> Fix string formatters in SettingsProvider SecurityException message.
rc/com/android/providers/settings/SettingsProvider.java
6be4025b1290e257a8d9142caba5bc7df72afab3 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 2810f681: Merge change 4694 into donut

Merge commit '2810f681991d1beb5ceb3515159f9fad3cc341d5'

* commit '2810f681991d1beb5ceb3515159f9fad3cc341d5':
Make SettingsProviders SecurityException messages more verbose.
2810f681991d1beb5ceb3515159f9fad3cc341d5 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4694 into donut

* changes:
Make SettingsProviders SecurityException messages more verbose.
16dd82cfdc879b7c3e51b19e54c70dbf78e8d697 19-Jun-2009 Brett Chabot <brettchabot@android.com> Make SettingsProviders SecurityException messages more verbose.
rc/com/android/providers/settings/SettingsProvider.java
130a8f8cbfa4d5185b53e782cb25412ae481017e 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3f4263fa: Merge change 4411 into donut

Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'

* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
Squashed commit of the following:
f204ab3ebc089373c44b6977f0db4b82891f128d 18-Jun-2009 Eric Fischer <enf@google.com> Squashed commit of the following:

commit 8e1a200225b7e4756b83d17d679a71a06a38b696
Author: Eric Fischer <enf@google.com>
Date: Tue Jun 16 16:32:56 2009 -0700

Make names of Settings, VPN, Subscribed Feeds providers localizable.
ndroidManifest.xml
es/values/strings.xml
3c3d3081aad5d3a0cadd18c7764974060c1a5274 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 727f36c6: Merge change 4265 into donut

Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
29930a1cb884885f92c72a76e42e795ac948edc3 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3dcea047: Merge change 4237 into donut

Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
cb05cc4acba4724d06120d2c606d955751bd0d11 16-Jun-2009 Dan Egnor <egnor@google.com> Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
reintroduced in an errant and clumsy git merge operation.

Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
es/values/strings.xml
2d4b6ad9d4c7e3e2dbb6a127f37271686253d71f 15-Jun-2009 Dan Egnor <egnor@google.com> Remove obsolete FOTA_UPDATE permission (which should never have been
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).

Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
ndroidManifest.xml
aa73f17201481f943345253328071118abc02933 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 6599426f: Merge change 4017 into donut

Merge commit '6599426f74371c823fcfe570f61577262eb0df44'

* commit '6599426f74371c823fcfe570f61577262eb0df44':
Make the date format preference work again.
328769582328192f8f361dcb56f2ad67ad00ae2c 12-Jun-2009 Eric Fischer <enf@google.com> Make the date format preference work again.

It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.

In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.

But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
rc/com/android/providers/settings/DatabaseHelper.java
544fff54a9cbcdf58ca993eeefed86699157f820 20-May-2009 Jaikumar Ganesh <jaikumar@google.com> am ee748d37: Fix network preference getting incorrectly set.

Merge commit 'ee748d37b01b3affb72b701d95ba20c189887b5f'

* commit 'ee748d37b01b3affb72b701d95ba20c189887b5f':
Fix network preference getting incorrectly set.
ee748d37b01b3affb72b701d95ba20c189887b5f 15-May-2009 Jaikumar Ganesh <jaikumar@google.com> Fix network preference getting incorrectly set.

When the phone process crashes, we set the network preference
incorrectly. Also read the default value from a system property.
rc/com/android/providers/settings/DatabaseHelper.java
60e6e19907c2a92242e6ae1c2df74c1f45609b92 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 83a6ec60: Merge change 1791 into donut

Merge commit '83a6ec600259d245b799a99a8e963704db031a63'

* commit '83a6ec600259d245b799a99a8e963704db031a63':
Add a method to get the PhoneType in CellLocation.
9bfbfbd40df381817c0c685b177a2a1d666e101d 15-May-2009 Jaikumar Ganesh <jaikumar@google.com> Add a method to get the PhoneType in CellLocation.

CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
rc/com/android/providers/settings/DatabaseHelper.java
fd38b81dca4fe29071620efacdea4c65f288d3b8 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> am f313b59b: Merge change 1957 into donut

Merge commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e'

* commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e':
Settings: Disable network location service by default, enable GPS instead.
79a6b3b4491269dfe004de361ca14761ffba4aa7 19-May-2009 Mike Lockwood <lockwood@android.com> Settings: Disable network location service by default, enable GPS instead.

Network Location Provider requires user opt-in, so it should be disabled by default
and only enabled if the user agrees to the terms of service and privacy policy.
Use GPS as default location provider instead.

Signed-off-by: Mike Lockwood <lockwood@android.com>
es/values/defaults.xml
ae267f9d45b4ea048071d8e3497b3db6d06cb7be 08-Apr-2009 Fred Quintana <> Merge branch 'readonly-p4-master'
89ce2447703a2e421b026b4712411a92adb3c24c 08-Apr-2009 Fred Quintana <> AI 144949: remove Maps

Automated import of CL 144949
tc/bookmarks.xml
48554fc78e981590708cc2cb78ce3c09642e2c4d 03-Apr-2009 Mike Lockwood <> Merge branch 'readonly-p4-master'
bd2a7126e5b42e022228c6aac25e95b671e5263b 03-Apr-2009 Mike Lockwood <> AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
making LocationManager.updateProviders() unnecessary.
Removed LocationManager.updateProviders()
Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
of enabling or disabling a single location provider.
This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
BUG=1729031
Original author: lockwood

Automated import of CL 144415
rc/com/android/providers/settings/SettingsProvider.java
9637d474899d9725da8a41fdf92b9bd1a15d301e 03-Apr-2009 Mike Lockwood <> AI 144372: Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
making LocationManager.updateProviders() unnecessary.
Removed LocationManager.updateProviders()
Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
of enabling or disabling a single location provider.
This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
BUG=1729031

Automated import of CL 144372
rc/com/android/providers/settings/SettingsProvider.java
d3af72792792dbd332446993c941e2714032d09f 02-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'readonly-p4-master'

Conflicts:

telephony/java/com/android/internal/telephony/gsm/RIL.java
resolved by removing gsm/RIL.java
04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc 02-Apr-2009 Wink Saville <> AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245
rc/com/android/providers/settings/DatabaseHelper.java
767a662ecde33c3979bf02b793d392aca0403162 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
rc/com/android/providers/settings/DatabaseHelper.java
e1861133d51b9e6a6f658eb366630ad4f4d3ff8f 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'

Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
105925376f8d0f6b318c9938c7b83ef7fef094da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
tc/Android.mk
tc/favorites.xml
2a73de7b21a89aa2ba4c254d28658b49793425b2 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ndroid.mk
tc/Android.mk
4df2423a947bcd3f024cc3d3a1a315a8dc428598 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
tc/favorites.xml
rc/com/android/providers/settings/DatabaseHelper.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
tc/Android.mk
tc/bookmarks.xml
tc/favorites.xml
es/drawable/ic_launcher_settings.png
es/values/defaults.xml
es/values/strings.xml
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
tc/Android.mk
tc/bookmarks.xml
tc/favorites.xml
es/drawable/ic_launcher_settings.png
es/values/defaults.xml
es/values/strings.xml
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
076357b8567458d4b6dfdcf839ef751634cd2bfb 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
rc/com/android/providers/settings/DatabaseHelper.java
3dec7d563a2f3e1eb967ce2054a00b6620e3558c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
rc/com/android/providers/settings/DatabaseHelper.java
074da8f9aa424b25d84f4e4eb762ca534ea96716 25-Feb-2009 James Wylder <jbob0823@gmail.com> Change scope on SettingsProvider.mDatabaseHelper and DatabaseHelper
This change will allow the DatabaseHelper to be inheritted and extended
without the need to make futher changes to the existing implementation.
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
tc/bookmarks.xml
es/values/defaults.xml
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
rc/com/android/providers/settings/DatabaseHelper.java
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroidManifest.xml
es/values/strings.xml
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
tc/Android.mk
tc/bookmarks.xml
tc/favorites.xml
es/drawable/ic_launcher_settings.png
rc/com/android/providers/settings/DatabaseHelper.java
rc/com/android/providers/settings/SettingsProvider.java