55553 Commits

Author SHA1 Message Date
Christopher Tate
728a1c4d5e Require the current backup pw in all backup/restore operations
Specifically, we now also require the current password to confirm any
restore operation.

Bug 4901637

Change-Id: I39ecce7837f70cd05778cb7e0e6390ad8f6fe3f3
2011-07-28 18:04:07 -07:00
Adam Powell
80df829e35 Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize if activity handles orientation change" 2011-07-28 16:40:03 -07:00
Justin Ho
f49b996385 Merge "Updated popup assets Bug: 5080369" 2011-07-28 16:39:36 -07:00
Justin Ho
f71c8a6e63 Merge "Updated spinner assets Bug: 5076695" 2011-07-28 16:39:21 -07:00
Justin Ho
4a66aeb0e2 Merge "Updated check_on and check_off" 2011-07-28 16:38:52 -07:00
Christopher Tate
0a779813e1 Merge "Support full-backup encryption and global backup password" 2011-07-28 16:28:21 -07:00
Romain Guy
b3a900d7cd Merge "Add notifyPixelsChanged() call to NDK unlockPixels()." 2011-07-28 16:26:08 -07:00
Irfan Sheriff
8d88cde56d Merge "Changed walled garden to better url" 2011-07-28 16:24:38 -07:00
Adam Powell
45c0b1954d Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize
if activity handles orientation change

Make sure that bar content height and sizing/layout parameters are
properly updated after a configuration change.

Change-Id: I886df5cd9a655ba1bd34fab2b48e8b5be67fcc32
2011-07-28 16:14:19 -07:00
Isaac Levy
88bae17cfd Changed walled garden to better url
Now checking for walled gardens using 204 error code on
http://clients3.google.com/generate_204

Change-Id: I0a00dc8b956f35f6695d2085c9f03ce40dc7e231
2011-07-28 16:07:05 -07:00
Christopher Tate
2efd2dbbac 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
2011-07-28 16:01:20 -07:00
Svetoslav Ganov
7434fe8be4 Merge "Updaing the database version" 2011-07-28 15:57:25 -07:00
Romain Guy
63bc83ed6f Merge "Correctly apply linear filter to drawBitmap(Rect, Rect)" 2011-07-28 15:43:31 -07:00
Romain Guy
b50149825f Correctly apply linear filter to drawBitmap(Rect, Rect)
Change-Id: I1049282e1996b1020c92cb7bec46e9f28e94e967
2011-07-28 15:40:47 -07:00
Adam Cohen
c9c4c2dad6 Merge "Fixing widget notifyDataSetChanged() not getting called, issue 5092676" 2011-07-28 15:36:19 -07:00
Justin Ho
0e15847cef Updated popup assets
Bug: 5080369

Change-Id: Ib7cca68dd2a8db416fd56e7303c12f0c1e5cd484
2011-07-28 15:15:52 -07:00
Justin Ho
491345b80b Merge "Updated presence icons Bug: 5045000" 2011-07-28 15:13:55 -07:00
Justin Ho
d1d223d570 Updated presence icons
Bug: 5045000

Change-Id: I05c83bd74e4959374e6f42897b984db5e74e0e9f
2011-07-28 15:07:41 -07:00
Justin Ho
03d43f8f43 Updated spinner assets
Bug: 5076695

Change-Id: I5d842eb49075ebf697a6ee4241e3101cbe605a57
2011-07-28 15:01:01 -07:00
Adam Cohen
2148d43eb2 Fixing widget notifyDataSetChanged() not getting called, issue 5092676
Change-Id: I61a034a77c0c9d07aba71bfabe7a0864ce92c2e9
2011-07-28 15:00:38 -07:00
Justin Ho
ecfae1f4c1 Updated check_on and check_off
Open issues:
- btn_check_mixed
- btn_check_on_disable_* misnamed?

Bug: 5076695
Change-Id: I2cac714b5d0d873c774ccd06068799173a089e7a
2011-07-28 14:44:37 -07:00
Jeff Sharkey
c07cc99ebb Merge "Keep original DialogTitle color when resizing." 2011-07-28 14:16:50 -07:00
Mike Lockwood
b7d95a46df am 21700fed: am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '21700fedfe29f6a0a752d2bea46142038e69136c':
  gps: Adding ip address for AGps
2011-07-28 14:06:07 -07:00
Mike Lockwood
21700fedfe am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
  gps: Adding ip address for AGps
2011-07-28 14:04:13 -07:00
Eric Laurent
fbaaeb96f2 Merge "Fix issue 5090721: audio record broken" 2011-07-28 14:03:33 -07:00
Mike Lockwood
5f7203eb25 am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
2011-07-28 14:02:14 -07:00
Robert Greenwalt
036fc921ca Merge "Stop sending tethering broadcasts during boot." 2011-07-28 14:00:48 -07:00
Mike Lockwood
5a27a7543e am bd1dee94: Merge "gps: Adding ip address for AGps"
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
2011-07-28 14:00:27 -07:00
Eric Laurent
d49ead677f Fix issue 5090721: audio record broken
Commit 6dbdc40 introduced a deadlock when exiting the
AudioFlinger RecordThread.

Change-Id: I1f63e54c5aeff05da4e4d028b53f734c62c78677
2011-07-28 13:59:02 -07:00
Mike Lockwood
bd1dee94df Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Stephen Li
8efd74dbed gps: Adding ip address for AGps
Change-Id: Ic590187d159853de2f1bd2912e159f0a00d8fb10
2011-07-28 16:50:45 -04:00
Mike Lockwood
3885228457 am f8d13e53: am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit 'f8d13e535c3e6166c2386adac3b3a2f115d2b79d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:30:24 -07:00
Mike Lockwood
f8d13e535c am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:27:27 -07:00
Mike Lockwood
bf676d460d am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:25:34 -07:00
Michael Jurka
265bfede6b Merge "Dismiss Recent Apps when Back is pressed" 2011-07-28 13:24:14 -07:00
Mike Lockwood
7083ed44ee am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:23:01 -07:00
Mike Lockwood
0ff79e88e2 Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Ben Murdoch
9ce97ccfd1 Merge "Revert "Disable Crankshaft in DRT for performance testing."" 2011-07-28 13:10:38 -07:00
Ben Murdoch
333d63ad62 Revert "Disable Crankshaft in DRT for performance testing."
This reverts commit 3f9d171e80eea1162c051dd7200dd828fa258e09.

Bug: 5052287
Change-Id: I8cd4a753e3a5a177934757a67880627c5c14e1af
2011-07-28 21:00:31 +01:00
Svetoslav Ganov
97c3311bb8 Updaing the database version
Change-Id: Iff671a152ac8c96d4136f0f268167c1b60842bb5
2011-07-28 12:45:06 -07:00
Svetoslav Ganov
8cbe6e8f12 Merge "Updating the data base upgrade/creation code for the new touch exploraion setting." 2011-07-28 12:29:29 -07:00
Adam Powell
7c8d19d53c Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes" 2011-07-28 11:58:21 -07:00
Robert Greenwalt
98c79e53c0 Stop sending tethering broadcasts during boot.
Well, actually they do go out, but they won't try to start anybody now
until after boot.

bug:5088272
Change-Id: Iaaf7a1e4b300e0afc3901ecfd225a77084bd0954
2011-07-28 11:51:11 -07:00
Adam Powell
88ab69780f Fix bug 5087752 - Maintain correct contrast against action bars in
inverse-bar themes

Add the actionBarWidgetTheme theme attribute. This lets a theme
specify a wrapper theme that can be used to create views that will
end up in the action bar so that the rest of the code can ignore
differences in contrast. (e.g. the inverse action bar themes.)

Apps can use ActionBar#getThemedContext() to obtain a Context with a
proper theme for views that will end up in the action
bar. MenuInflaters generated by Activities will automatically use this
to properly theme inflated action views.

Change-Id: Ib28c82bf47c25d446cca2a63f617b8a4a0afa6b2
2011-07-28 11:44:41 -07:00
Jeff Sharkey
5c848ce793 Keep original DialogTitle color when resizing.
Change-Id: Id9d3bf565cc5660ab37037e74be63221cd638ba6
2011-07-28 11:35:04 -07:00
Svetoslav Ganov
a28a16d1c2 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
2011-07-28 11:26:02 -07:00
Svetoslav Ganov
a7ffaee298 Merge "AccessibilityNodeInfo reports no children for the topmost view in the tree." 2011-07-28 11:09:43 -07:00
Michael Jurka
e9166ede07 Dismiss Recent Apps when Back is pressed
Change-Id: I17a1ee9683910113d822a084f804646580ab43cb
2011-07-28 10:45:10 -07:00
Justin Ho
3c469975b0 Merge "Updated expander assets" 2011-07-28 10:39:36 -07:00
Martijn Coenen
9b3c83fbad Add constant for NFC sharing settings screen.
Change-Id: Ibeea153442110542f05d1ece57a7dc6388a91fbf
2011-07-28 12:37:18 -05:00