Commit Graph

51902 Commits

Author SHA1 Message Date
Kenny Guy
467eb0566f Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 2015-05-13 21:07:17 +00:00
Jeff Sharkey
c968e21937 Merge "Determine if we have adoptable disks." into mnc-dev 2015-05-13 20:57:03 +00:00
Jeff Sharkey
0d838a0fad Determine if we have adoptable disks.
Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
2015-05-13 13:54:35 -07:00
Jorim Jaggi
131a19ee6f Merge "Persist fingerprint names" into mnc-dev 2015-05-13 20:32:31 +00:00
Todd Kennedy
d90bf46264 Merge "Don't negate saving state" into mnc-dev 2015-05-13 20:27:17 +00:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Julia Reynolds
396d944001 Merge "Remove initiator name param." into mnc-dev 2015-05-13 20:14:44 +00:00
Kenny Root
f5d758c006 Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev 2015-05-13 20:14:26 +00:00
John Spurlock
fb13d497ae Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 2015-05-13 20:10:49 +00:00
Jeff Sharkey
2817f22d15 Merge "Hide API not ready for prime time." into mnc-dev 2015-05-13 20:08:13 +00:00
Jeff Sharkey
f85ac77f0c Hide API not ready for prime time.
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
2015-05-13 13:07:29 -07:00
Kenny Root
725a4a71b8 Start handshake before calling hostname verifier, part 2
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.

Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.

Follow up for change 317c0a4959df0361431d5fbf7dacc162bfb48cd2

Bug: 21118659
Change-Id: I8c606a78ba8a990b4e0d28880b566867261fefbc
2015-05-13 13:04:44 -07:00
John Spurlock
bbde26774f Zen: Use shorter version of countdown condition summary in footer.
To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
2015-05-13 15:45:40 -04:00
Jeff Sharkey
4af455beb7 Merge "Rewriting should fail when any paths are null." into mnc-dev 2015-05-13 19:39:26 +00:00
Jeff Sharkey
41be35dd01 Rewriting should fail when any paths are null.
Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
2015-05-13 12:38:16 -07:00
Kenny Root
84260768c4 Merge "Start handshake before calling hostname verifier" into mnc-dev 2015-05-13 19:04:09 +00:00
Kenny Root
423a47bb02 Start handshake before calling hostname verifier
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.

Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.

(cherry picked from commit 317c0a4959df0361431d5fbf7dacc162bfb48cd2 in
external/apache-http)

Bug: 14975169
Bug: 17332309
Bug: 17524215
Bug: 17812533
Bug: 18507278
Bug: 19069992
Bug: 19378885
Bug: 19414083
Bug: 19550311
Bug: 19731556
Bug: 19853723
Bug: 20908941
Bug: 21118659
Change-Id: Ie74ec12c8b131c7bf400a07fc91c78da4d5e470f
2015-05-13 11:58:31 -07:00
Todd Kennedy
46d168fb6b Don't negate saving state
In the original implementation, we would only save the state if the
activity was "!isFinishing()". That was abstracted into a method
that returned whether we should save state. However, the "!" wasn't
removed. D'oh.

Bug: 20860094
Change-Id: I8827cb265f2e7fb911f5d110c56e464aa092bfe7
2015-05-13 11:13:58 -07:00
Chad Brubaker
90c66e3ded Merge "Add keystore onUserAdded/Removed methods" into mnc-dev 2015-05-13 18:10:05 +00:00
Chris Wren
5e4027fe25 Merge "induct a bunch of new logging categories." into mnc-dev 2015-05-13 18:05:56 +00:00
Chad Brubaker
83ce095c84 Add keystore onUserAdded/Removed methods
(cherry-picked from commit 31c2897105)

Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
2015-05-13 10:57:42 -07:00
Jonathan Basseri
c69cd0bf75 Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 2015-05-13 17:46:32 +00:00
Nicolas Prevot
22fec2201f Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 2015-05-13 17:46:05 +00:00
Jonathan Basseri
4f9ad1678e Switching to PersistableBundle in carrier config API.
Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
2015-05-13 10:45:29 -07:00
Chris Wren
28890446fd induct a bunch of new logging categories.
Bug: 20264417
Change-Id: Ica85a31016592be87f727c0d86a4be59eb854158
2015-05-13 13:37:42 -04:00
Mady Mellor
21623faa44 Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 2015-05-13 17:34:13 +00:00
Clara Bayarri
99bd704f1c Merge "Fix Floating Toolbar appearing after ActionMode was cancelled" into mnc-dev 2015-05-13 15:46:59 +00:00
Clara Bayarri
0d7d4ef560 Fix Floating Toolbar appearing after ActionMode was cancelled
The Views created for the Toolbar were not cleaned up properly when the
mode was cancelled by the client in onCreateActionMode, leading to the
toolbar appearing over other views when it shouldn't due to
onWindowFocusChanged showing the Toolbar if it exists.

We don't actually need the views if we don't know whether they are
going to be shown yet, so moved view creation to after onCreateActionMode

Bug: 20713912
Change-Id: Ic0c31d1634e1e96d9981a77b2c769306a8bf1a8d
2015-05-13 16:03:14 +01:00
Brian Colonna
9a61013d2d Merge "Removed unused Face Unlock aidl files" into mnc-dev 2015-05-13 13:27:15 +00:00
Erik Kline
cf304fb35c Merge "Initial IpReachabilityMonitor implementation." into mnc-dev 2015-05-13 13:11:13 +00:00
Erik Kline
787d935611 Initial IpReachabilityMonitor implementation.
Add a class that monitors on-link IP reachability and notifies
callers whenever any on-link addresses of interest appear to have
become unresponsive.

Bug: 18581716
Change-Id: I333eee6fe30fa97a21297c6745de14ceb95bb661
2015-05-13 21:36:15 +09:00
Tobias Sargeant
ebc456691e Merge "Improve documentation and rename insertVisualStateCallback to postVisualStateCallback." into mnc-dev 2015-05-13 11:33:18 +00:00
Tobias Sargeant
b365604977 Improve documentation and rename insertVisualStateCallback to postVisualStateCallback.
Bug: 21043955
Change-Id: I077cad68fb519581387d1b474f27d43222f68e3b
2015-05-13 11:23:57 +01:00
Erik Kline
5a5745b30c Merge "Add basic netlink library code." into mnc-dev 2015-05-13 07:05:00 +00:00
Erik Kline
6193aa3305 Add basic netlink library code.
Add netlink socket helpers and parsing code for basic netlink messages.
Additionally, support from some neighbor discovery -specific messages
is included.

Bug: 18581716
Change-Id: Ib2aa924222b63cdbebf09a8bf8ff35ee24269fc5
2015-05-13 15:18:39 +09:00
Jeff Sharkey
44b4add4ce Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:30 +00:00
Fabrice Di Meglio
a5c24e3bfe Merge "Add IntentFilter auto verification - part 9" into mnc-dev 2015-05-13 01:53:08 +00:00
Selim Gurun
94fa03876e Merge "Add a temporary wrapper for ViewStructure until Webview APK is updated" into mnc-dev 2015-05-13 01:23:52 +00:00
Nicolas Prevot
ebe2d99160 Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
In the html doc, it showed up as (@see #ACTION_PROVISION_MANAGED_PROFILE).

Change-Id: I4b3eec26525c6bd87319296f4bb89d037dfc3d03
2015-05-12 18:17:17 -07:00
Selim Gurun
0b408586c6 Add a temporary wrapper for ViewStructure until Webview APK is updated
It turned out that after the API change from ViewAssistStructure to
ViewStructure, the suggested mechanism did not work, and webview
started throwing abstractmethoderror exceptions. Temporarily
solve the problem by wrapping ViewStructure inside a
ViewAssistStructure. Once Webview APK is updated, drop it.

Change-Id: I09dfe7dac9c2bc7c037d842844c61dd879629470
2015-05-12 18:06:59 -07:00
Svet Ganov
221ffb2662 Merge "Runtime permissions for system components not revokable - framework" into mnc-dev 2015-05-13 00:17:46 +00:00
Ruben Brunk
4143fbcfa8 Merge "camera2: Fix crop selection in LEGACY." into mnc-dev 2015-05-13 00:09:50 +00:00
Fabrice Di Meglio
ef741da4d4 Add IntentFilter auto verification - part 9
- make verifyIntentFilter(int, int, List<String>) a SystemApi

See bug #19628271

Change-Id: I8b1f29da385867beb8b19829c124db1821450c41
2015-05-12 16:58:30 -07:00
Adam Powell
8c6cd9088e Merge "Apply API feedback for ChooserTarget" into mnc-dev 2015-05-12 23:57:32 +00:00
Svet Ganov
b3f22b48bb Runtime permissions for system components not revokable - framework
Change-Id: I5b1d7bb1618ffa8d1231618ece47d0905c82f7bf
2015-05-12 16:49:19 -07:00
Alan Viverette
c25771ce22 Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev 2015-05-12 23:34:15 +00:00
Alan Viverette
a789325a0f Update scrollIndicators XML enums to match View constants
Bug: 21027462
Change-Id: I41e503e218253cf63bc44a82345f8b086261e379
2015-05-12 16:25:47 -07:00
Roozbeh Pournader
0ca0f58000 Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev 2015-05-12 22:59:47 +00:00
Jeff Sharkey
7d2af54a98 New "sm" shell tool to call StorageManager.
Surface basic StorageManager commands through shell tool, like
simple listing of disks and volumes, and commands like mounting and
partitioning.

The output is designed to be parsed by host-side testing tools,
instead of relying on fragile dumpsys parsing.

Bug: 19993667
Change-Id: I993e92ecf57996678965945f0ae648b392a77ea2
2015-05-12 15:52:43 -07:00
Xiyuan Xia
55e603ee9d Merge "Make PIN/Password/Pattern check async" into mnc-dev 2015-05-12 22:08:10 +00:00