232701 Commits

Author SHA1 Message Date
Tomasz Mikolajewski
1f0c3f04a7 Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev 2016-02-12 00:26:45 +00: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
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
John Reck
9036f9989b Merge "Fix build" into nyc-dev 2016-02-11 22:35:36 +00:00
John Reck
d61fd4ede5 Fix build
Change-Id: Id793d3a824902ab794b5d5a4cdf4c77a72c52add
2016-02-11 14:35:08 -08:00
Ben Kwa
166639aefa Merge "Handle spacebar events." into nyc-dev 2016-02-11 22:18:54 +00:00
Adam Lesinski
9e1923d02f AAPT: Remove warnings for public resources without comments
There are so many public resources that do not warrant comments
that having a warning that no one cares about is just producing
log spam.

Bug:21495023
Change-Id: I84e3b39c7139ee67fb5cb711d5ab466d8f4ef2e0
2016-02-11 14:17:25 -08:00
John Reck
ca11dd75ca Merge "Fix bpp mismatch" into nyc-dev 2016-02-11 22:05:14 +00:00
Ben Kwa
c345079b74 Handle spacebar events.
Space/Shift-space scrolls the files list up/down.

BUG=25195555

This is a re-land of ag/864217.

Change-Id: I496d43d8a0c0833493ec2d5b36ecb7cbeb619853
2016-02-11 13:39:33 -08:00
Derek Sollenberger
991da31d40 Update HWUI makefiles to support use by other targets (e.g. Skia)
(1) Update both static and shared lib to export libhwui headers
(2) Work around problem in current make system where a static
    libraries dependencies are not transitively included by moving
    those dependencies into a file that can be included by targets
    using libhwui_static.
(3) Do not expose protobuf headers to clients outside of HWUI

Change-Id: I08470c02a83ae64116081eff0c2050878990c6ed
2016-02-11 16:23:19 -05:00
John Reck
1d4e6a0901 Fix bpp mismatch
Bug: 26980851

GL_RGBA16F was being incorrectly calculated
as 4 bpp instead of 16 in Texture's objectSize(),
leading to a mismatch in cache size tracking
in GradientCache

Change-Id: I533c52fcdf9910d7a7d14bbd80965b8cbef8e147
2016-02-11 13:22:25 -08:00
Ben Kwa
d3107e8894 Merge "Revert "Handle spacebar events."" into nyc-dev 2016-02-11 21:20:08 +00:00
Ben Kwa
be660049bb Revert "Handle spacebar events."
This reverts commit ef8eb5c9dd45cc94219d6e889d026f53ecc5c7e9.

Change-Id: I6c473d09eae8289da1deb86a8f043aa88de4c6f0
2016-02-11 21:19:54 +00:00
Ben Kwa
d7211c85d6 Make left- and right- arrow jump rows in grid mode.
Like ChromeOS.  Pressing left at the beginning of a row of files in grid
mode, will move focus up to the end of the preceding row.  Analogous
behaviour for right-arrow at the end of a row.

BUG=27127282

Change-Id: I3b36c1da6559aaf01558807913502f8ab87a9e6e
(cherry picked from commit f55e5b714d4adc9f343ab7e691a6846ffa6cd7b1)
2016-02-11 21:11:45 +00:00
Ben Kwa
4a993b240d Merge "Allow multiple range selections using the shift key." into nyc-dev 2016-02-11 21:08:53 +00:00
Ben Kwa
844674f99f Merge "Handle shift-enter key events." into nyc-dev 2016-02-11 21:07:12 +00:00
Ben Kwa
22b598bb82 Merge "Handle spacebar events." into nyc-dev 2016-02-11 21:06:51 +00:00
Lifu Tang
94093b94cc Merge "Fixed the build break" into nyc-dev 2016-02-11 21:06:01 +00:00
Ben Kwa
83df50f997 Allow multiple range selections using the shift key.
- Introduce an API on MultiSelectManager for starting/ending range
  selections.

- Navigation with the shift key pressed extends the current range
  selection (or starts a new one, if one isn't in progress).

- Navigation without the shift key pressed will end the current range
  selection.

BUG=27124371

Change-Id: Ieddf3ee816812bf5210463536fe63179ef1809ad
(cherry picked from commit 09792ef1506f4cbd944e16651508be435d92c5be)
2016-02-11 21:01:04 +00:00
Phil Weaver
fd32b894ff Merge "Fix ViewPager crash for a11y z order." into nyc-dev 2016-02-11 20:58:31 +00:00
Lifu Tang
a2b74fd268 Fixed the build break
Change-Id: I02ee9b3f44d79510f174a1041f28b9c60450aa9c
2016-02-11 12:57:59 -08:00
Ben Kwa
09eb77be9a Handle shift-enter key events.
Shift-enter toggles selection on the focused item.

BUG=25196158

Change-Id: I261c249cdf1856d134910a4767b0daf8963d5b68
(cherry picked from commit e0e36df29484bf6b0b34fb958701ed7ddd96a40a)
2016-02-11 20:56:09 +00:00
Ben Kwa
ef8eb5c9dd Handle spacebar events.
Space/Shift-space scrolls the files list up/down.

BUG=25195555

Change-Id: Ib6351831db77a930920610106cc1da2b710532c6
(cherry picked from commit 870fea3b03d94335b9c7234103bde8fbf813743f)
2016-02-11 20:55:29 +00:00
Hall Liu
a97006f9c6 Merge "Initialize MD5 in logging in background" into cw-e-dev am: 5839e7804c
am: 6579e696fc  -s ours

* commit '6579e696fce978987e819d964d0f36179c05d5e0':
  Initialize MD5 in logging in background
2016-02-11 20:51:56 +00:00
Daichi Hirono
c18f8076eb Show specific error message for busy device.
When MTP device is busy (e.g. used by other application),
MtpDocumentsProvider cannot open the device. The CL introduces specific
error message for the case.

BUG=26694828

Change-Id: Iffee2e1c554e4089601186469ff0eac2fd04decd
2016-02-11 12:45:55 -08:00
Sergey Poromov
65775b9c68 Use long for preflight check size in BackupManagerService.
Bug: 26557141
Change-Id: I3794a91b62578044745a61bf774f5028f3e3b373
2016-02-11 20:44:09 +00:00
Daichi Hirono
ef2feefab7 Returns "application/octet-stream" for unknown types of MTP files.
According to DocumentsContract mime type field is required.
MtpDocumentsProvider should returns mime type for unknown types of MTP
files as well.

BUG=27148801

Change-Id: I7e4b832f6c00f438cf90190c074f204fdedceef5
2016-02-11 12:41:39 -08:00
Sergey Poromov
b9196c3a98 Merge "Don't call BackupTransport#checkFullBackupSize when preflight timeouted." into nyc-dev 2016-02-11 20:36:33 +00:00
Jorim Jaggi
8690558241 Handle light status bar for split-screen
In split-screen the light status bar flag for one side of the
status bar can be different from the other side.
SYSTEM_UI_FLAG_LIGHT_STATUS_BAR is now reported for both
the fullscreen stack and docked stack, but not anymore in the
"default" SysUI visibility field when reporting a visibility
change to SystemUI. The change also reports the docked stack
and the fullscreen stack bounds, so SystemUI can guard tinting
the icons on whether the icon is one of the areas.

When calculating the light status bar flag in PWM, we keep track
of the top fullscreen opaque window state for the docked and
fullscreen stack separately.

Bug: 24365214
Change-Id: Id2240a86d75bf96e0138ec7652a4793859f56e3c
2016-02-11 12:18:40 -08:00
Lifu Tang
ade2f66fd8 Merge "Optimized the memory consumption and renamed PRN" into nyc-dev 2016-02-11 20:10:11 +00:00
Paul Stewart
cea11df038 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev
am: 4e9e3d02e0

* commit '4e9e3d02e057ddccb95d5299e60ac02da7766024':
  WifiManager: Return empty scan list on remote exception
2016-02-11 20:07:26 +00:00
Chong Zhang
94b84028ba Merge "Mark activity as visible and not stopped after resume-relaunch." into nyc-dev 2016-02-11 20:05:59 +00:00
Winson
231bc9c54a Adding view debug annotations to simplifying debugging state.
Change-Id: If90955f44be55ff09208998214bc1bb47f93a872
2016-02-11 12:01:50 -08:00
Paul Stewart
4e9e3d02e0 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev 2016-02-11 20:01:18 +00:00
Chong Zhang
2b79af1e8a Mark activity as visible and not stopped after resume-relaunch.
After a resume-relaunch, the activity is assumed to be in resumed state,
and we'll not run the normal code for resume. But it needs to be marked
visible otherwise it will stuck in invisible state.

Also trade some AM traces for WM traces for further debugging.

bug: 27123118
Change-Id: I50ce5cde29f441115675db54523090ef86d95ea8
2016-02-11 12:00:27 -08:00
Winson
8be1634a54 Disallow launching third party apps in safe mode.
- Also desaturates out the disabled task

Bug: 25785926
Change-Id: I9fa48c062cfaf6d9cb60a9e49291ca6e15c6b343
2016-02-11 11:58:56 -08:00
Winson Chung
1af8eda6ea Drawing thumbnail background color for empty space in view.
Change-Id: I2e8dfbe9c11a61876956658eff0674adb26d855d

Signed-off-by: Winson <winsonc@google.com>
2016-02-11 11:48:33 -08:00
Makoto Onuki
5f05cf9612 Merge "If package has no active admins, just uninstall right away" into nyc-dev 2016-02-11 19:42:54 +00:00
Robert Carr
bc89e59295 Correct error in window lifetime.
Correct a simple logic error where application stop state is incorrectly
reset.

Bug: 27112965
Change-Id: I3058378c1e240e0a02665ad479678723e14921aa
2016-02-11 19:42:42 +00:00
Selim Cinek
635f71925a Merge "Added support for media notifications without expanded state" into nyc-dev 2016-02-11 19:37:50 +00:00
Lifu Tang
120480f17a Optimized the memory consumption and renamed PRN
Bug: 27058251
Change-Id: I2309943b1a4e7565868ed0f247b84edc631fbd59
2016-02-11 11:29:40 -08:00
Kenny Guy
641ea634ee Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev 2016-02-11 19:27:22 +00:00
Paul Stewart
ed9297991a WifiManager: Return empty scan list on remote exception
In the (hopefully rare) situation where there is a remote exception
from a call to getScanResults(), do not pass null back to callers.
Nobody expects this, and failures that occur as a result can distract
from the real problem (e.g., the system server crashing).  This CL
now returns an empty list.

BUG=27139097
TEST=None

Change-Id: I637eae1fa8ac1a1bc2b76dea8628359b5dec06e1
2016-02-11 11:16:17 -08:00
Wale Ogunwale
567704bca2 Merge "Force pre-N apps to be resizeable." into nyc-dev 2016-02-11 18:55:50 +00:00