Jeremy Klein
5ebff810ff
Remove PM query for silent provisioning BroadcastReceiver.
...
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
(cherry picked from commit f19aa5574b
)
2016-02-09 23:28:47 +00:00
Jim Miller
017bdceeb4
Fix crash in Settings on devices without fingerprint.
...
Fixes bug 27060816
Change-Id: I3b45d3bfa6e47abb4a43ca95c15fd3614f9478dd
2016-02-09 15:15:32 -08:00
Udam Saini
052319e657
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev am: 40f4bf2a1f
...
am: d36f4e2be2
* commit 'd36f4e2be29f59041f078313b8e42547e3ffeeae':
Adds the headers for choose lock generic inside onCreate
2016-02-09 22:53:11 +00:00
Samuel Tan
c9e2bcf8e2
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
am: aedb058e1b
...
am: 711b01b80d
* commit '711b01b80dabf096b814b7bbcb1686c462bb3adb':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 22:53:00 +00:00
Jeremy Klein
ccf1821fa8
Merge "Remove PM query for silent provisioning BroadcastReceiver."
2016-02-09 21:44:48 +00:00
Andre Eisenbach
6979c8bbe3
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
2016-02-09 21:20:04 +00:00
Jeremy Klein
f19aa5574b
Remove PM query for silent provisioning BroadcastReceiver.
...
This fixes TetherService unit tests.
Change-Id: I404d0e9322d14242997576e30ba75941423b331b
2016-02-09 13:11:25 -08:00
Anna Galusza
5df008fd0b
Merge "Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev."
2016-02-09 20:34:30 +00:00
Udam Saini
8ef4c62003
Reworks lock screen flows.
...
This also adds frp warning dialogs in case the user skips lock
screen setup initially.
bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c
2016-02-09 11:58:12 -08:00
Udam Saini
d36f4e2be2
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
...
am: 40f4bf2a1f
* commit '40f4bf2a1fc9e4c60f44661647f091f6c0e91cb3':
Adds the headers for choose lock generic inside onCreate
2016-02-09 18:50:39 +00:00
Udam Saini
40f4bf2a1f
Merge "Adds the headers for choose lock generic inside onCreate" into nyc-dev
2016-02-09 18:47:13 +00:00
Udam Saini
6de85e80a9
Adds the headers for choose lock generic inside onCreate
...
This will make sure the headers are set before the underlying
RecyclerView has made its first layout, and prevents an animation
from playing when rotating to landscape.
bug:26990364
Change-Id: I2838a07a145b4d6136e88125ab955006d84d135c
2016-02-09 10:32:56 -08:00
Samuel Tan
711b01b80d
Allow trusted system certificates to be used in EAP network configs am: 2b16cd3920
...
am: aedb058e1b
* commit 'aedb058e1b46ce559fc6a282820a89dcbc9c15d1':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 18:29:47 +00:00
Samuel Tan
aedb058e1b
Allow trusted system certificates to be used in EAP network configs
...
am: 2b16cd3920
* commit '2b16cd3920f95b2cd5c2426d81b5e1584ffc682d':
Allow trusted system certificates to be used in EAP network configs
2016-02-09 18:24:20 +00:00
Anna Galusza
132e0784eb
Change style of Preview screens (dark borders with "preview" on the bottom).
...
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
(cherry picked from commit 206a845710
)
2016-02-09 08:48:14 -08:00
Andre Eisenbach
bbf4f66143
Add Developer menu entry to disable Bluetooth absolute volume
...
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-08 17:20:07 -08:00
Anna Galusza
d6717ddccf
Revert "Change style of Preview screens (dark borders with "preview" on the bottom)." to prevent merge conflict when this change is submitted into nyc-dev.
...
This reverts commit 206a845710
.
Change-Id: I7a773fee68c28f3046a8099fa266183c3c3799ae
2016-02-08 23:28:40 +00:00
Tony Mantler
e6bf755125
Merge "Fix security level display" into nyc-dev am: b42b9045e2
...
am: 2eef414b1d
* commit '2eef414b1d585e0473853a36d1766250f5cb2194':
Fix security level display
2016-02-08 22:43:26 +00:00
Suprabh Shukla
c8bd4a8e61
Merge "Adding an easy uninstall for active device admin"
2016-02-08 22:41:40 +00:00
Anna Galusza
7526c0a3de
Update strings for A11y SUW. am: 0239f95538
...
am: 85657bc86c
* commit '85657bc86c26dc9d6985e2bb4caa967037c521b1':
Update strings for A11y SUW.
2016-02-08 22:41:26 +00:00
Tony Mantler
2eef414b1d
Merge "Fix security level display" into nyc-dev
...
am: b42b9045e2
* commit 'b42b9045e25d24676ef9c3e0cb3b36f2c98d9a10':
Fix security level display
2016-02-08 22:34:50 +00:00
Anna Galusza
85657bc86c
Update strings for A11y SUW.
...
am: 0239f95538
* commit '0239f95538b572c7951cac65707d906ef051bbf3':
Update strings for A11y SUW.
2016-02-08 22:34:24 +00:00
Tony Mantler
b42b9045e2
Merge "Fix security level display" into nyc-dev
2016-02-08 22:05:08 +00:00
Tony Mantler
3cf07c849b
Fix security level display
...
b/26979319
Change-Id: I049a7f8f7c7917fdc2739234077247116dd8159d
2016-02-08 14:02:05 -08:00
Anna Galusza
2fe55a705b
Merge "Update strings for A11y SUW."
2016-02-08 21:44:32 +00:00
Anna Galusza
0239f95538
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 21:44:13 +00:00
Jim Miller
bbf1cc268c
Fix crash in ConfirmCredentials due to missing fp service. am: 5947d3517d
...
am: d15761a95f
* commit 'd15761a95f93808351a1ae513cc8eb6b9b4234ee':
Fix crash in ConfirmCredentials due to missing fp service.
2016-02-08 20:42:45 +00:00
Jim Miller
d15761a95f
Fix crash in ConfirmCredentials due to missing fp service.
...
am: 5947d3517d
* commit '5947d3517d1cd841ddeb6f756e1953fc8679c9cc':
Fix crash in ConfirmCredentials due to missing fp service.
2016-02-08 20:40:40 +00:00
Jim Miller
5947d3517d
Fix crash in ConfirmCredentials due to missing fp service.
...
Fixes bug 27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit 0918e5d650
)
2016-02-08 20:31:49 +00:00
Jim Miller
0918e5d650
Fix crash in ConfirmCredentials due to missing fp service.
...
Fixes bug 27060816
Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
2016-02-08 12:29:25 -08:00
Anna Galusza
d5c26eef64
Update strings for A11y SUW.
...
Change-Id: I1cd15ca81ffd258edf683d69a50261a403f97d42
2016-02-08 11:46:21 -08:00
Geoff Mendal
6ccf89899d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0f6b093db7
-s ours
...
am: 1319d058e5
-s ours
* commit '1319d058e5f95840136b71881c43251968eb2c99':
Import translations. DO NOT MERGE
2016-02-08 19:19:08 +00:00
Julia Reynolds
1879dd1a5a
Update DND visual interruption choices.
...
am: 9bfad94ea3
* commit '9bfad94ea370f8b8048c13d16117bc8c01a394c2':
Update DND visual interruption choices.
2016-02-08 19:18:56 +00:00
Geoff Mendal
1319d058e5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 0f6b093db7
-s ours
* commit '0f6b093db74fc4b1b914b1d7b301f9e841184ffe':
Import translations. DO NOT MERGE
2016-02-08 19:02:24 +00:00
Anna Galusza
62f75238e5
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)."
2016-02-08 17:46:43 +00:00
Geoff Mendal
0f6b093db7
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-08 16:57:24 +00:00
Geoff Mendal
582bc62a3d
Import translations. DO NOT MERGE
...
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
2016-02-08 17:55:50 +01:00
Samuel Tan
2b16cd3920
Allow trusted system certificates to be used in EAP network configs
...
Add an option to the "CA certificate" field of the EAP network
configuration menu, "Use system certificates". Choosing this option
will cause the trusted, pre-installed, system CA certificates
to be used to validate EAP servers during the authentication process.
This only applies to EAP-TLS, EAP-TTLS, and EAP-PEAP network
configurations, where the CA certificate option is available.
If the user selects "Use system certificates" and leaves the
"Domain" field empty, display a warning and prevent the
EAP network configuration from being saved. Such a configuration
would be insecure--the user should constrain the domain that
the system certificates can be used to validate.
BUG: 26879191
TEST: 1) Set up AP connected to test RADIUS server.
TEST: 2) Generate a self-signed cert (Cert 1)
TEST: 3) Use Cert 1 to sign another cert (Cert 2) with common name
"sub1.sub2.domain.com"
TEST: 4) Setup RADIUS server, and configure it to present Cert 2 to EAP peer.
TEST: 5) Build angler image with Cert 1 installed in
/system/etc/security/cacerts/
TEST: 6) Set up an AP connected to the RADIUS server to broadcast
a WPA-Enterprise network.
TEST: 7) On Angler, connect to this WPA-Enterprise network with settings:
Network name: (AP SSID)
Security: 802.1x EAP
EAP method: TLS
CA certificate: Use system certificates
Domain: domain.com
User certificate: (test certificate from RADIUS setup)
Identity: (identity used for RADIUS setup)
TEST: 8) Verify that we connect successfully to the AP.
TEST: 9) Verify that connection still succeeds if Domain is set to
"sub2.domain.com" and "sub1.sub2.domain.com".
TEST: 10) Verify that connection fails if Domain is set to
"sub0.sub1.domain.com" and "otherdomain.com".
TEST: 11) Verify that network configuration cannot be saved, and an
warning message "Must specify a domain" is displayed if Domain
is left blank in the configuration in step 7
TEST: 12) Verify that the "Do not validate" option still appears in the
CA certificate dropdown menu.
Change-Id: I346d4d301305719033b84ec4599bf3d57d9d4ee5
2016-02-08 08:54:42 -08:00
Julia Reynolds
9bfad94ea3
Update DND visual interruption choices.
...
Change-Id: I9313052d60a9fbd88546c1478ac9b830ae6fc40c
2016-02-08 15:19:45 +00:00
Clara Bayarri
7f2a013619
Make ChooseLockGeneric read the userId extra from the activitie's extras if there's no arguments
...
Some invocations of ChooseLockGeneric are done with arguments, but
when invoking it from FingerprintEnrollIntroduction we add the extra
to the activity intent so we need to support both.
Bug: 26901625
Change-Id: Iaabad18bf17160578f6b6d807dc6acfead1ba419
2016-02-08 14:16:24 +00:00
Clara Bayarri
719668508a
Do not unify locks when Work lock is set to None
...
Bug: 26845805, 26892601
Change-Id: Ie78ef417a59b29246d4d3dde5dfe434ad49b195c
2016-02-08 13:49:45 +00:00
Anna Galusza
206a845710
Change style of Preview screens (dark borders with "preview" on the bottom).
...
Change-Id: I754a3fd4de47ef74a3a79e410890133de9e0d095
2016-02-05 18:02:54 -08:00
Adam Lesinski
fdb17a7ba2
Merge "Update FakeUid interface to match BatteryStats.Uid"
2016-02-06 00:52:39 +00:00
Alan Viverette
145b2faf58
Merge "Reject all touch events in TouchBlockingFrameLayout"
2016-02-05 21:28:58 +00:00
Alan Viverette
764dce2ea4
Reject all touch events in TouchBlockingFrameLayout
...
Bug: 27042494
Change-Id: Ie1400f4c47d812b1f664abc955ee3dfdd03fa4a5
2016-02-05 16:13:27 -05:00
Samuel Tan
5e5038255c
Correctly load saved EAP CA cert and user cert options
...
am: 3d8cdb10f6
* commit '3d8cdb10f6103a794e4cb68adb5de03a325d1c8f':
Correctly load saved EAP CA cert and user cert options
2016-02-05 20:58:15 +00:00
Jeremy Klein
c69f2be466
Merge "Remove TetherUtil functions which are no longer needed."
2016-02-05 18:15:30 +00:00
Jeremy Klein
6895446453
Merge "Make TetherSettings use the new tether api."
2016-02-05 18:14:50 +00:00
Julia Reynolds
57fae3b3e2
Merge "Remove bad activity filter."
2016-02-05 16:11:56 +00:00
Andrei Stingaceanu
da49313845
Restrict notification preferences for suspended apps
...
Bug: 26856390
Bug: 22776761
Change-Id: I7f03b8b95af93db66f12c5ac1cbf490b4ae0e73c
2016-02-05 15:24:03 +00:00