Commit Graph

6822 Commits

Author SHA1 Message Date
Amith Yamasani
6707999600 Merge "Handle disallowed NFC beam restriction" into lmp-dev 2014-09-09 20:30:36 +00:00
Adam Lesinski
3649045d10 Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev 2014-09-09 20:30:11 +00:00
Amith Yamasani
25a1e95ed6 Handle disallowed NFC beam restriction
Don't enable the beam setting and toggle if it is disallowed for
the current user.

Bug: 17387303
Change-Id: Ifdfe049bef281454c978a37acb49c59758344ae6
2014-09-09 12:07:11 -07:00
Adam Lesinski
21dfa201f8 Make UsageAccess WarningDialog actually instatiatable.
The DialogFragment used for WarningDialog was not instatiatable
by the fragment manager.

Bug:17435234
Change-Id: I5f65dd1e0ec0b95d048934480bd5fafd8648ab7c
2014-09-09 11:34:55 -07:00
Carlos Valdivia
92f7615502 SECURITY: Prevent preference intents from exploiting settings.
Settings has super powers because it shares the system uid. We prevent
those powers from being exploited by malicious authenticators by
checking the intents those authenticators provide.

We will only launch intents that resolve to Activities that are exported=true
or owned by the same UID as the authenticator.

Bug: 14408627
Change-Id: Ia179df8561d29745767dac0f3c97eb0f68083f59
2014-09-09 11:17:19 -07:00
PauloftheWest
29a9c6844b Merge "Removed connect button from Saved Networks dialog." into lmp-dev 2014-09-09 18:00:49 +00:00
PauloftheWest
c009b8a496 Fixed a Null Pointer Error in Bluetooth Settings.
+ The root of the problem is that the callback for a device change may be
set before the fragment has a layout.  Then if a change does come in,
getView() would return null.  This fix delays registering the callback
until appropiate.

Bug: 17404518
Change-Id: Ibd0e90f82593d45729f427bcc2e40fe9195eb42a
2014-09-09 10:12:00 -07:00
Zoltan Szatmary-Ban
574db42695 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-09-09 11:05:54 +00:00
Elliott Hughes
5c0d0729b1 Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 2014-09-08 23:26:20 +00:00
PauloftheWest
a7383f3862 Removed connect button from Saved Networks dialog.
Bug: 17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
2014-09-08 16:06:04 -07:00
PauloftheWest
e5f8473576 Merge "Disabled SIM Cards in Settings." into lmp-dev 2014-09-08 22:02:11 +00:00
PauloftheWest
9998f473ca 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
2014-09-08 14:16:30 -07:00
Andres Morales
4fc50daefa Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev 2014-09-08 21:07:48 +00:00
PauloftheWest
5fe30ea841 Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev 2014-09-08 21:00:11 +00:00
PauloftheWest
469c812878 Turning Bluetooth on will make the device discoverable.
Bug: 17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
2014-09-08 13:31:53 -07:00
Andres Morales
e6bf2a5609 Fix issue where can't FR Volantis if OEM unlock is enabled
Bug: 17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
2014-09-08 13:14:00 -07:00
Alan Viverette
01f3a15e89 Merge "Use correct list index for search highlighting" into lmp-dev 2014-09-08 19:47:54 +00:00
Alan Viverette
2fed4d4256 Use correct list index for search highlighting
BUG: 14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
2014-09-08 12:40:59 -07:00
vandwalle
c187193c19 Merge "prettify the wifi verbose logging string" into lmp-dev 2014-09-08 19:22:40 +00:00
Carlos Valdivia
690ce1b325 Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev 2014-09-08 18:21:03 +00:00
Jim Miller
1f389c1996 Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev 2014-09-08 08:26:14 +00:00
Alexandra Gherghina
80cd373263 Merge "Reset Settings task when using the user switcher" into lmp-dev 2014-09-08 08:04:44 +00:00
Alexandra Gherghina
dc3193ca63 Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev 2014-09-08 08:03:40 +00:00
vandwalle
b6854480d4 prettify the wifi verbose logging string
Bug:15168065

Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
2014-09-07 22:03:19 -07:00
Carlos Valdivia
f5d3e74ecc 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
2014-09-07 17:45:58 -07:00
Amith Yamasani
30c50b15d0 Use correct API for badging
Bug: 17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
2014-09-07 15:38:09 -07:00
Jim Miller
250b9bee68 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
2014-09-07 14:30:38 -07:00
Fabrice Di Meglio
b5cc01342e Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev 2014-09-05 21:12:51 +00:00
Fabrice Di Meglio
92239ed799 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
2014-09-05 14:08:58 -07:00
PauloftheWest
c7fafa25c2 Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev 2014-09-05 20:48:56 +00:00
Amith Yamasani
9164862936 Merge "Follow API change for method name" into lmp-dev 2014-09-05 19:44:22 +00:00
PauloftheWest
8677d04512 Material design updates for Bluetooth Settings dialog.
Bug: 17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
2014-09-05 10:29:17 -07:00
Amith Yamasani
375baea456 Follow API change for method name
Bug: 17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
2014-09-05 10:23:04 -07:00
Svetoslav
fd3a3d7929 Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev 2014-09-05 17:10:06 +00:00
Svetoslav
527ecccce8 Merge "Update Settings due to API changes." into lmp-dev 2014-09-05 17:09:15 +00:00
Alexandra Gherghina
af0d9540c2 Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Bug: 17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
2014-09-05 16:46:54 +01:00
Dan Sandler
8aed3e3f9e 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
2014-09-05 13:59:31 +00:00
Alexandra Gherghina
56645002b2 Reset Settings task when using the user switcher
Bug: 17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
2014-09-05 11:39:39 +01:00
Wink Saville
aa188b539b Merge "More cleanup prior to unhiding" into lmp-dev 2014-09-05 03:40:35 +00:00
Svetoslav
4a361df54b 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
2014-09-04 19:54:21 -07:00
Svetoslav
39f82a7c98 Update Settings due to API changes.
bug:17390424

Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
2014-09-04 18:00:23 -07:00
Wink Saville
78b36ba35e More cleanup prior to unhiding
Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
2014-09-04 15:36:49 -07:00
Fabrice Di Meglio
0535ed559e Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev 2014-09-04 22:09:19 +00:00
Fabrice Di Meglio
f91b4dbc33 Fix bug #17393417 Developer Options are not indexed after activating them
- add forceUpdate field copy in the UpdateData copy constructor

Change-Id: I245ce76bf9798c359219e153d2af9d08e7e11903
2014-09-04 15:04:23 -07:00
PauloftheWest
4a1b7b5f94 Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev 2014-09-04 21:25:05 +00:00
PauloftheWest
6a1a6a943a Bug fix: Toggling Bluetooth off then on will now initiate a scan.
Bug: 17380015
Change-Id: Ie07d9a4f737df32aba7e400b028144f7a81cb37e
2014-09-04 14:10:24 -07:00
Chris Wren
0a59607e5e Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 20:38:40 +00:00
Fabrice Di Meglio
ed1175cf0c Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev 2014-09-04 20:06:23 +00:00
Fabrice Di Meglio
eced780ff5 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
2014-09-04 13:04:56 -07:00
Andres Morales
1c09186d64 Merge "Fix issue with wifi passwords >16 chars" into lmp-dev 2014-09-04 19:31:48 +00:00