232744 Commits

Author SHA1 Message Date
Derek Sollenberger
67b1684a07 Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev 2016-02-12 13:40:43 +00:00
Rubin Xu
d6c90a8883 Merge "Fix testApplicationRestrictionsManagingApp unit test" into nyc-dev 2016-02-12 11:53:45 +00:00
Narayan Kamath
36fb3a0e34 Track libcore change 9fbdd1b27de1a3d1005468108.
bug: 26689841
Change-Id: I3a0e5d3ab1ada313d73514913990a2aa19ad5b8f
2016-02-12 11:50:04 +00:00
Daniel U
43bb0a0643 Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev 2016-02-12 11:24:56 +00:00
Shweta Chahar
239f248280 Merge "Remove higher speech rate settings." into nyc-dev 2016-02-12 11:18:33 +00:00
Erik Kline
1ec7ee58b8 resolve merge conflicts of 3b74289fdf to nyc-dev
Change-Id: Ib41c75bf44bdafbe57532717e8f41a4ed545d29c
2016-02-12 20:01:48 +09:00
Erik Kline
2c5927caeb Merge "Duplicate DhcpStateMachine public constants into DhcpClient" into nyc-dev 2016-02-12 10:51:54 +00:00
Gustav Sennton
7a002a215d Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev 2016-02-12 10:35:24 +00:00
Erik Kline
09bf13574e Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 19:02:39 +09:00
Jae Seo
d0efcbbbb5 TIF: Check the CEC message length before copying the data
Bug: 25768736
Change-Id: Ife46891e785fe816c0ee6ba65bd57512366ce84d
2016-02-12 00:12:36 -08:00
Erik Kline
3b74289fdf Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 17:10:15 +09:00
Phil Burk
d817dfd531 Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev 2016-02-12 06:32:14 +00:00
Roozbeh Pournader
79f7dc8fa2 Merge "Fix locale matching algorithm for resources" into nyc-dev 2016-02-12 05:19:37 +00:00
Roozbeh Pournader
4de4596ac1 Fix locale matching algorithm for resources
We get ResTables two different ways: one is from AAPT, another from
settings-based requests from the Java side. In the settings-based
requests, localeScript will be autocomputed, but for AAPT-filled
tables (especially if they come from older versions of AAPT), we need
to compute the script.

Previously, locales that came from packages were incorrectly assumed
to have "undeterminable" scripts, rather than "undetermined" scripts.
This led to us mistakenly falling back to the old logic of requiring
the locales' countries to match, rather than just looking at computed
scripts.

Bug: 27157452

Change-Id: Id7e346d3ecfb17273ffb63de5bcb4849a6eafbbd
2016-02-12 05:18:38 +00:00
Tomasz Mikolajewski
48599c0668 Do not show directory change animation on screen rotation.
When more than one level deep directory is opened.

Bug: 27090439
Change-Id: I73e789a820af3b710f0981ac12f5ea43cc389cf6
(cherry picked from commit f908640fd07b4734b8ef235ed2849ea20c55acab)
2016-02-12 04:24:58 +00:00
Tyler Gunn
99d5635929 Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
am: 989594638a

* commit '989594638ad2aa7360cf39b5ea67c137a9078c86':
  IMS RAT Reporting in Registration Unsol
2016-02-12 03:45:32 +00:00
Tyler Gunn
989594638a Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev 2016-02-12 03:40:08 +00:00
Jorim Jaggi
ec1d075e5f Fix NullPointerException
Change-Id: Ifce7af5ac6aacc04fb621f3afd707164f36ba980
2016-02-11 19:22:43 -08:00
Jorim Jaggi
e26334ba1a Merge "Handle light status bar for split-screen" into nyc-dev 2016-02-12 03:12:18 +00:00
Daichi Hirono
0abde68519 Merge "Add error message for locked device." into nyc-dev 2016-02-12 02:51:17 +00:00
Daichi Hirono
2965776ba4 Add error message for locked device.
If the remote MTP device is a smartphone, it does not provide files
until a user unlocks the device. The CL adds specific error message for
the situation.

BUG=26318917

Change-Id: Ic4c34609c55ec9c99b7b8a9143d6dae3835784e3
2016-02-11 18:45:30 -08:00
Daichi Hirono
46d537716e Merge "Open the connected device in Files app when tapping notification." into nyc-dev 2016-02-12 02:38:29 +00:00
Selim Cinek
f64044c6a4 Fixed a bug where custom notifications were invisible
Change-Id: If981a380ed7e3ef7000e245aefaf36d039e15cfa
2016-02-11 18:33:26 -08:00
Jim Miller
f77d612568 Update FBE notification strings
Fixes bug 26863154

Change-Id: I6b130a8ba6e21e2cbd47551aabf5fc3e31f6f1c0
(cherry picked from commit 6338561c925fc4885275949d29193c14e83db71f)
2016-02-12 02:22:36 +00:00
Selim Cinek
6f4fcdc4e6 Fixed a transformation error when fading in views
Views could still be stuck in a old translation and
therefore the whole view looked weird.

Change-Id: I48a8f8824d8e5bdb0913a24783967a36c34797a8
2016-02-11 18:10:21 -08:00
Selim Cinek
a40915077f Fixed animation jank in notification groups
When group children are animating from single line to expanded,
the animation was jarring.

Change-Id: I4b248b2f59a842befaa0f5d5440c55f140584da2
2016-02-11 17:53:12 -08:00
Adam Lesinski
d7d584b225 Merge "AAPT: Remove warnings for public resources without comments" into nyc-dev 2016-02-12 01:42:16 +00:00
Fyodor Kupolov
50b5616dcc Merge "Clear calling identity before setting restrictions" into nyc-dev 2016-02-12 01:37:38 +00:00
Daichi Hirono
90b345138f Merge "Show specific error message for busy device." into nyc-dev 2016-02-12 01:02:53 +00:00
Daichi Hirono
f4fe20ad71 Merge "Returns "application/octet-stream" for unknown types of MTP files." into nyc-dev 2016-02-12 00:51:29 +00:00
Felipe Leme
089c9c0c6c Merge "Optimized add|removeRestrictBackgroundWhitelistedUid()." into nyc-dev 2016-02-12 00:50:47 +00:00
Selim Cinek
de33a4ad56 Fixed a bug where the single line view would be invisible
When updating a child notification, the single line view was
removed leading to invisible group children.

Bug: 27137268
Change-Id: Id9e6ce2ae081ec746118f4367644ea8843d51f10
2016-02-11 16:43:41 -08:00
Phil Burk
cd0e210651 AudioTrack: fix docs for return code for setBufferSizeInFrames()
Also added some documentation links that were failing before.

Change-Id: I0a744dd0a3d3e1d09f643b35d976863fa0422d10
Signed-off-by: Phil Burk <philburk@google.com>
2016-02-11 16:42:13 -08:00
Felipe Leme
e2dd62ea5a Merge "Split bugreport identifier into id and pid." into nyc-dev 2016-02-12 00:40:40 +00:00
Daichi Hirono
1e3744441a Open the connected device in Files app when tapping notification.
Previously when tapping the MTP devce notification, MtpDocumentsProvider
opens home direcotry in Files app. The CL adds data URI of connected
device to the intent so that MtpDocumentsProvider can open the connected
device's root in Files app.

BUG=26611224
Change-Id: I97ecd6669852cd2fc875294cbcbf5660fbfaa0da
2016-02-11 16:36:49 -08:00
Etan Cohen
fa8e9aabe2 NAN: Disable all DBG flags.
am: 7d6c389edf

* commit '7d6c389edf41ef8ce490fa7af963484f9502cbc1':
  NAN: Disable all DBG flags.
2016-02-12 00:35:10 +00:00
Winson Chung
34f5c494df Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
* changes:
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:29:43 +00:00
Tomasz Mikolajewski
1f0c3f04a7 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev 2016-02-12 00:26:45 +00:00
Adam Powell
565943fda5 ChooserActivity direct share jank fixes
Don't show the ChooserTargetService targets until we have all
responses in, or we hit our timeout. This helps prevent targets from
jumping around under the user's finger. We still give bonuses to
services that respond faster.

Bug 26790940

Change-Id: I8a19e19e08eeb502ccc4b4feaa1710ca3315e9f6
2016-02-11 16:18:29 -08:00
Jae Seo
d0e47d0aef Merge "TIF: Separate service connection errors from recording errors" into nyc-dev 2016-02-12 00:05:01 +00:00
Fyodor Kupolov
aa72470acb Merge "During update enable system apps for requested users only" into nyc-dev 2016-02-12 00:04:04 +00:00
Omkar Kolangade
d4e44bbdbf IMS RAT Reporting in Registration Unsol
Adding a parameter to the IMS registration complete
and progressing callbacks, allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I271f2fca299585302a67d0f5476f6fac3e7099dd
2016-02-11 23:51:41 +00:00
Jae Seo
25c9c5edab TIF: Separate service connection errors from recording errors
Also clarify the expected behaviors when an error has occurred in a
recording session.

Bug: 27110861
Change-Id: I811197e45ea94b1b0e151d534a1f030a84b89d10
2016-02-11 15:44:55 -08:00
Selim Cinek
3362c1306e Fixed a bug where huns could be invisible
When an unpinned fullscreen notification was in the shade
all successive normal huns would be invisible.
Also removed the sorted entries as it could lead to stale
data and crashes.

Bug: 27136766
Change-Id: Ib5239325e452a2b949cb4a4b8478d231189c4722
2016-02-11 15:43:03 -08:00
Rob Carr
2b63730837 Merge "Correct error in window lifetime." into nyc-dev 2016-02-11 23:06:25 +00:00
Etan Cohen
7d6c389edf NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
2016-02-11 15:00:57 -08:00
Shreyas Basarge
73f1025f2d Fix for JobScheduler dropping periodic jobs
Skip writing to disk when a periodic job is
removed from jobStore after it completes
execution.

Change-Id: Ib4f2cf18554bf9c87138c1984c96cc62f8dbf7e2
Bug: 27147454
2016-02-11 22:53:09 +00:00
Paul Stewart
be5084b87a Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant.  Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.

This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.

Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal.  All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.

In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.

Bug:26400915
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I1e09fb3f1f27b2ba844acbed14ec0f570e915b80
2016-02-11 14:52:58 -08:00
Selim Cinek
322ec7e279 Fixed a crash with notification children
When moving children between parents, Sysui could crash
because it wasn't removed yet properly from the old parent.
We are now doing this sequencially, i.e first removing the
children and then adding the new ones.

Bug: 27137301
Change-Id: I1925662a9d7f224f133827d524d080994753ba25
2016-02-11 14:47:06 -08:00
John Reck
9036f9989b Merge "Fix build" into nyc-dev 2016-02-11 22:35:36 +00:00