OSDN Git Service
Jorim Jaggi [Tue, 9 Sep 2014 16:25:46 +0000 (18:25 +0200)]
Fix layout issues with landscape pattern/password layouts
Bug:
17416448
Change-Id: I12067846b05659dc7b56fe61f872a4ba85941604
Elliott Hughes [Mon, 8 Sep 2014 23:26:20 +0000 (23:26 +0000)]
Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 22:34:50 +0000 (22:34 +0000)]
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 22:02:11 +0000 (22:02 +0000)]
Merge "Disabled SIM Cards in Settings." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 22:01:06 +0000 (22:01 +0000)]
Merge "Material theme updates for Wifi Dialog." into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 21:52:37 +0000 (14:52 -0700)]
Fixed scrolling on the Wi-Fi Settings Dialog.
+ When needed, scrollbars will always appear on the Wi-Fi Settings Dialog.
Bug:
17166502
Change-Id: I7f61746b505d1a1476e987571dc757d01ce636df
PauloftheWest [Fri, 5 Sep 2014 20:52:26 +0000 (13:52 -0700)]
Material theme updates for Wifi Dialog.
Bug:
17014192
Change-Id: I1e5dd04199a433d8d1c5c4e4c48329e871e28db5
PauloftheWest [Mon, 8 Sep 2014 18:08:41 +0000 (11:08 -0700)]
Disabled SIM Cards in Settings.
+ Multi-SIM has been punted out from the L release. This change disables
the SIM Cards UI while keeping the code base.
Bug:
16808006
Change-Id: I2bd7ad430a6309f3f2241cd26ec86268aa31b699
Andres Morales [Mon, 8 Sep 2014 21:07:48 +0000 (21:07 +0000)]
Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev
PauloftheWest [Mon, 8 Sep 2014 21:00:11 +0000 (21:00 +0000)]
Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 21:45:40 +0000 (14:45 -0700)]
Turning Bluetooth on will make the device discoverable.
Bug:
17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
Andres Morales [Mon, 8 Sep 2014 20:14:00 +0000 (13:14 -0700)]
Fix issue where can't FR Volantis if OEM unlock is enabled
Bug:
17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
Alan Viverette [Mon, 8 Sep 2014 19:47:53 +0000 (19:47 +0000)]
Merge "Use correct list index for search highlighting" into lmp-dev
Alan Viverette [Mon, 8 Sep 2014 19:40:59 +0000 (12:40 -0700)]
Use correct list index for search highlighting
BUG:
14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
vandwalle [Mon, 8 Sep 2014 19:22:39 +0000 (19:22 +0000)]
Merge "prettify the wifi verbose logging string" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 19:13:09 +0000 (19:13 +0000)]
Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev
Carlos Valdivia [Mon, 8 Sep 2014 18:21:03 +0000 (18:21 +0000)]
Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev
Jim Miller [Mon, 8 Sep 2014 08:26:14 +0000 (08:26 +0000)]
Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:04:43 +0000 (08:04 +0000)]
Merge "Reset Settings task when using the user switcher" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:03:38 +0000 (08:03 +0000)]
Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
vandwalle [Fri, 5 Sep 2014 07:00:24 +0000 (00:00 -0700)]
prettify the wifi verbose logging string
Bug:
15168065
Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug:
17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
Amith Yamasani [Sun, 7 Sep 2014 22:38:09 +0000 (15:38 -0700)]
Use correct API for badging
Bug:
17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
Jim Miller [Sat, 6 Sep 2014 01:48:18 +0000 (18:48 -0700)]
Fix problem where rotating the device doesn't launch TrustAgent pref
This fixes a bug where the TrustAgent intent was being lost when
the device configurtion changes. It used to depend on a view that
gets recreated. Instead, we persist the actual launch intent
which works across activity restarts.
Fixes bug
17040470
Change-Id: Ia1c93867254cfdc27683a767cf41fe74dbb97db0
Fabrice Di Meglio [Fri, 5 Sep 2014 21:12:51 +0000 (21:12 +0000)]
Merge "Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
Fabrice Di Meglio [Fri, 5 Sep 2014 21:08:58 +0000 (14:08 -0700)]
Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard
- remove any reference to the Switch and use the SwitchBar API instead
- set the initial state of the SwitchBar depending on the WifiManager
Change-Id: I556bf8a007892c057edf7c6c144f71b2dcfe4f99
PauloftheWest [Fri, 5 Sep 2014 20:48:56 +0000 (20:48 +0000)]
Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
Barnaby James [Fri, 5 Sep 2014 19:59:20 +0000 (19:59 +0000)]
Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 19:44:22 +0000 (19:44 +0000)]
Merge "Follow API change for method name" into lmp-dev
PauloftheWest [Sun, 24 Aug 2014 18:10:16 +0000 (11:10 -0700)]
Material design updates for Bluetooth Settings dialog.
Bug:
17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
Amith Yamasani [Fri, 5 Sep 2014 17:23:04 +0000 (10:23 -0700)]
Follow API change for method name
Bug:
17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
Svetoslav [Fri, 5 Sep 2014 17:10:05 +0000 (17:10 +0000)]
Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
Svetoslav [Fri, 5 Sep 2014 17:09:14 +0000 (17:09 +0000)]
Merge "Update Settings due to API changes." into lmp-dev
Jorim Jaggi [Fri, 5 Sep 2014 16:06:26 +0000 (16:06 +0000)]
Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
Jorim Jaggi [Fri, 5 Sep 2014 15:56:17 +0000 (17:56 +0200)]
Remove weird divider from confirm_lock_pattern
Bug:
16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
Alexandra Gherghina [Wed, 3 Sep 2014 13:17:35 +0000 (14:17 +0100)]
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Bug:
17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
Alexandra Gherghina [Fri, 5 Sep 2014 15:32:14 +0000 (16:32 +0100)]
Fix typo in intent filter
Bug:
16647771
Change-Id: I44c46a92fee23f78591677f7ea399fd963b4df16
Alexandra Gherghina [Fri, 5 Sep 2014 15:26:58 +0000 (15:26 +0000)]
Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
Alexandra Gherghina [Fri, 5 Sep 2014 14:27:03 +0000 (15:27 +0100)]
Update Settings cross-profile intent filters upon OTA
Bug:
16647771
Change-Id: I2e23d26b425bde5339221851ac54aab760dc1cc9
Dan Sandler [Thu, 4 Sep 2014 00:19:28 +0000 (02:19 +0200)]
Only fetch titles of ringtones coming from the MediaStore.
As a fallback we attempt to get DISPLAY_NAME from the
provider. Any other URIs probably don't have titles.
Bug:
14093281
Change-Id: I39adbad52ef6dcc1686cbc738457b55c33948bd6
Alexandra Gherghina [Fri, 5 Sep 2014 10:42:51 +0000 (11:42 +0100)]
Splits out ACTION_MAIN intent filter for Settings and doesn't
forward it.
This is required so that general queries for ACTION_MAIN apps
do not get stuck with the IntentForwarderActivity.
Bug:
17053933
Change-Id: Ie04e2b29f2467e14fd82d27c1e94d93eda90f4c1
Alexandra Gherghina [Thu, 4 Sep 2014 15:52:53 +0000 (16:52 +0100)]
Reset Settings task when using the user switcher
Bug:
17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
Barnaby James [Thu, 4 Sep 2014 22:33:23 +0000 (15:33 -0700)]
Remove intent filter for Airplane mode voice activity.
Change-Id: I7f217350fdb51c2a88c92777d33c021dd32cd07e
Bug:
17398731
Wink Saville [Fri, 5 Sep 2014 03:40:35 +0000 (03:40 +0000)]
Merge "More cleanup prior to unhiding" into lmp-dev
Svetoslav [Fri, 5 Sep 2014 02:54:15 +0000 (19:54 -0700)]
Fix an occasional crash in print job state fragment in Settings.
There is a NPE in the print settings if the following occurs:
We open the print job state UI in settings for an ongoing print
job (now we have action bar buttons for cancel and restart);
now the print job gets completed and we update the UI and
since the print job is not longer present we nullify the current
job reference and finish the activity. But since activity
is not finished immediately there is an opportunity for the
user to click on the action bar options which results in NPE.
The fix is to not update the print job instance in the update
UI method if the job is not available, i.e. the update method
does not mutate state if the job is no longer present, as we
are finishing and performing an operation on a finished job will
have no effect.
bug:
17387134
Change-Id: I501ed1e05b8b70584b3299a16e93ead5ab7f155f
Svetoslav [Thu, 4 Sep 2014 23:51:43 +0000 (16:51 -0700)]
Update Settings due to API changes.
bug:
17390424
Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
Wink Saville [Thu, 4 Sep 2014 22:36:49 +0000 (15:36 -0700)]
More cleanup prior to unhiding
Rename public SubInfoRecord instance variables
Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
Fabrice Di Meglio [Thu, 4 Sep 2014 22:09:18 +0000 (22:09 +0000)]
Merge "Fix bug #
17393417 Developer Options are not indexed after activating them" into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 22:04:23 +0000 (15:04 -0700)]
Fix bug #
17393417 Developer Options are not indexed after activating them
- add forceUpdate field copy in the UpdateData copy constructor
Change-Id: I245ce76bf9798c359219e153d2af9d08e7e11903
PauloftheWest [Thu, 4 Sep 2014 21:25:04 +0000 (21:25 +0000)]
Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 21:10:24 +0000 (14:10 -0700)]
Bug fix: Toggling Bluetooth off then on will now initiate a scan.
Bug:
17380015
Change-Id: Ie07d9a4f737df32aba7e400b028144f7a81cb37e
Chris Wren [Thu, 4 Sep 2014 20:38:39 +0000 (20:38 +0000)]
Merge "Implement per-app sensitivity settings toggle." into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 20:06:22 +0000 (20:06 +0000)]
Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 20:01:55 +0000 (13:01 -0700)]
Increase the delay for the Search result Ripple effect to happen
- will actually make the Ripple look better and a bit longer
(it was showing and disappearing a bit too fast)
See bug: #
14974443
Change-Id: I7a0354c679cfa8d9596bcb957c922b8dcf88f0e3
Andres Morales [Thu, 4 Sep 2014 19:31:56 +0000 (19:31 +0000)]
Merge "New black drawables for tap and pay" into lmp-dev
Andres Morales [Thu, 4 Sep 2014 19:31:47 +0000 (19:31 +0000)]
Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
Andres Morales [Thu, 4 Sep 2014 19:11:26 +0000 (12:11 -0700)]
New black drawables for tap and pay
Much more visible than the white ones on a white bg
Bug:
17155785
Change-Id: I1c135ca819ee6734289777b3e694c7548777cb84
Andres Morales [Thu, 4 Sep 2014 18:42:53 +0000 (11:42 -0700)]
Fix issue with wifi passwords >16 chars
Wasn't calculating their length in hex properly
Bug:
17369745
Change-Id: I7652c10a2e0704877ad113fcbc04007845a862e3
Baligh Uddin [Thu, 4 Sep 2014 18:34:46 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 17:50:00 +0000 (17:50 +0000)]
Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 17:34:17 +0000 (17:34 +0000)]
Merge "Fix the truncating of Bluetooth icons." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 17:14:19 +0000 (10:14 -0700)]
Material theme updates for Bluetooth Device picker.
Bug:
17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
Fabrice Di Meglio [Thu, 4 Sep 2014 17:01:15 +0000 (17:01 +0000)]
Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
Chris Wren [Thu, 4 Sep 2014 15:20:05 +0000 (15:20 +0000)]
Implement per-app sensitivity settings toggle.
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug:
16324353
PauloftheWest [Thu, 4 Sep 2014 15:27:32 +0000 (08:27 -0700)]
Fix the truncating of Bluetooth icons.
Bug:
17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
Chris Wren [Thu, 4 Sep 2014 13:41:08 +0000 (13:41 +0000)]
missing dep. Revert "Implement per-app sensitivity settings toggle."
This reverts commit
56131de7412edaab9f3e5834fe3888ac8588ec79.
Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
Chris Wren [Thu, 4 Sep 2014 13:40:04 +0000 (13:40 +0000)]
Merge "Implement per-app sensitivity settings toggle." into lmp-dev
Dan Sandler [Thu, 4 Sep 2014 13:15:47 +0000 (13:15 +0000)]
Merge "Don't block notifications from system packages." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 12:50:03 +0000 (12:50 +0000)]
Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:38:48 +0000 (12:38 +0000)]
Merge "Put VPN settings under primary profile control" into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 11:55:48 +0000 (11:55 +0000)]
Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
Alexandra Gherghina [Thu, 4 Sep 2014 09:26:02 +0000 (09:26 +0000)]
Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 06:11:31 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46cb4475ee4c31d33f11c15cc33f6a4a2c045bc7
Auto-generated-cl: translation import
Fabrice Di Meglio [Thu, 4 Sep 2014 01:25:43 +0000 (18:25 -0700)]
Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings
- add the requested infos
Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
Elliott Hughes [Wed, 3 Sep 2014 00:10:14 +0000 (17:10 -0700)]
Start cleaning up percentage formatting in Settings.
This fixes some of the percentage formatting issues, but there are
still about ten strings with hard-coded %%s in them.
Bug:
15476051
Change-Id: I668b6b16e598425f6006f6de0005c980f613f5b2
PauloftheWest [Thu, 28 Aug 2014 21:10:36 +0000 (14:10 -0700)]
Aligned buttons on the Wi-Fi Assistant Card.
Bug:
17305353
Change-Id: Iffdcd9b1248dc7e6bd13c9eeca267392d2171c86
Dan Sandler [Wed, 3 Sep 2014 14:48:13 +0000 (16:48 +0200)]
Don't block notifications from system packages.
Bug:
16703366
Change-Id: Id2f635e4e99df0c10afff8a0f5130179d381762c
PauloftheWest [Wed, 3 Sep 2014 22:00:38 +0000 (22:00 +0000)]
Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:43:55 +0000 (20:43 +0000)]
Merge "Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:40:08 +0000 (13:40 -0700)]
Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed
- use the Preference.setSummary(CharSequence) instead of trying to set the summary
manually
Change-Id: I3692c50e3821a34a9c03a614cbc40209157068f3
Fabrice Di Meglio [Wed, 3 Sep 2014 20:00:25 +0000 (20:00 +0000)]
Merge "Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 19:57:25 +0000 (12:57 -0700)]
Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
- revert to the correct string for the Preference screen title.
Change-Id: I17c58485875e71e5785d5879b60aebcf6c4d454a
Chris Wren [Tue, 2 Sep 2014 21:26:17 +0000 (17:26 -0400)]
Implement per-app sensitivity settings toggle.
Change-Id: I0e70e6ce5c4a56d738c1850c50c2e268296d9d92
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug:
16324353
Wink Saville [Wed, 3 Sep 2014 18:26:02 +0000 (18:26 +0000)]
Merge "Prepare to make SubscriptionManager public." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 17:56:07 +0000 (17:56 +0000)]
Merge "Fix bug #
17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
Dan Sandler [Tue, 2 Sep 2014 16:31:49 +0000 (18:31 +0200)]
Fix links to notification settings activities.
Additionally, we now show the user a list of "app-like"
things (packages with launchable activities) instead of only
non-system things. This way you can make (some) changes to
system package notifications while not having to page
through reams of random non-app packages.
Bug:
17277023
Change-Id: I920d6b941070efb75a816e6ad38b798b09a83d08
PauloftheWest [Tue, 2 Sep 2014 21:22:55 +0000 (14:22 -0700)]
Fixed an issue were "Saved Networks" would not appear correctly.
Bug:
17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
Alexandra Gherghina [Wed, 3 Sep 2014 10:01:45 +0000 (11:01 +0100)]
Code clean-ups following moving the managed profile under accounts
Bug:
16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
Wink Saville [Wed, 3 Sep 2014 05:40:55 +0000 (22:40 -0700)]
Prepare to make SubscriptionManager public.
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.
Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
Fabrice Di Meglio [Wed, 3 Sep 2014 01:22:09 +0000 (18:22 -0700)]
Fix bug #
17208479 Have Cellular Networks Show up in Data Usage
- prevent collisions in the DocId (which is the primary key of
the FTS4 table)
- instead of just using "updatedTitle" hash, use instead
"updatedTitle + screenTitle"
Change-Id: If38f7bcc7fb857d59242d08c16c39adb80590254
Vinit Deshpande [Wed, 3 Sep 2014 00:59:56 +0000 (00:59 +0000)]
Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:56:28 +0000 (00:56 +0000)]
Merge "Change the location mode before applying restrictions" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:10:18 +0000 (17:10 -0700)]
Change the location mode before applying restrictions
Once the location sharing restriction is applied, the setting cannot
be changed, so change the setting first.
Bug:
17348894
Change-Id: I9dcad230e816aaa2482f1f35f1993f51d14eabc7
PauloftheWest [Tue, 2 Sep 2014 21:31:22 +0000 (21:31 +0000)]
Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 23:08:49 +0000 (16:08 -0700)]
Fixed a crash when loading Bluetooth Settings.
Bug:
17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
Jason Monk [Tue, 2 Sep 2014 20:04:35 +0000 (20:04 +0000)]
Merge "Bring back auto-rotate to settings" into lmp-dev
Jason Monk [Wed, 20 Aug 2014 17:29:20 +0000 (13:29 -0400)]
Bring back auto-rotate to settings
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.
Bug:
16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
Paul Lawrence [Tue, 2 Sep 2014 19:33:25 +0000 (19:33 +0000)]
Merge "Get correct factory reset reason from encryption failure" into lmp-dev
Maurice Lam [Tue, 2 Sep 2014 18:51:36 +0000 (18:51 +0000)]
Merge "[WifiSetup] Add shadow below header" into lmp-dev
Paul Lawrence [Thu, 28 Aug 2014 22:56:38 +0000 (15:56 -0700)]
Get correct factory reset reason from encryption failure
Requires matching framework change
https://googleplex-android-review.git.corp.google.com/#/c/535832/
Bug:
17213613
Change-Id: Ia8006f4a9cb5909d83f1848d9acfbc3f1e0ab5fb