OSDN Git Service
Daniel U [Fri, 12 Feb 2016 11:24:55 +0000 (11:24 +0000)]
Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev
Shweta Chahar [Fri, 12 Feb 2016 11:18:33 +0000 (11:18 +0000)]
Merge "Remove higher speech rate settings." into nyc-dev
Erik Kline [Fri, 12 Feb 2016 11:01:48 +0000 (20:01 +0900)]
resolve merge conflicts of
3b74289fdf to nyc-dev
Change-Id: Ib41c75bf44bdafbe57532717e8f41a4ed545d29c
Erik Kline [Fri, 12 Feb 2016 10:51:53 +0000 (10:51 +0000)]
Merge "Duplicate DhcpStateMachine public constants into DhcpClient" into nyc-dev
Gustav Sennton [Fri, 12 Feb 2016 10:35:23 +0000 (10:35 +0000)]
Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev
Erik Kline [Thu, 11 Feb 2016 15:17:02 +0000 (00:17 +0900)]
Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.
Bug:
24837343
Bug:
26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
Erik Kline [Thu, 11 Feb 2016 15:17:02 +0000 (00:17 +0900)]
Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.
Bug:
24837343
Bug:
26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
Phil Burk [Fri, 12 Feb 2016 06:32:13 +0000 (06:32 +0000)]
Merge "AudioTrack: fix docs for return code for setBufferSizeInFrames()" into nyc-dev
Roozbeh Pournader [Fri, 12 Feb 2016 05:19:36 +0000 (05:19 +0000)]
Merge "Fix locale matching algorithm for resources" into nyc-dev
Roozbeh Pournader [Fri, 12 Feb 2016 01:58:24 +0000 (17:58 -0800)]
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
Tomasz Mikolajewski [Tue, 9 Feb 2016 10:48:49 +0000 (19:48 +0900)]
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)
Tyler Gunn [Fri, 12 Feb 2016 03:45:32 +0000 (03:45 +0000)]
Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
am:
989594638a
* commit '
989594638ad2aa7360cf39b5ea67c137a9078c86':
IMS RAT Reporting in Registration Unsol
Tyler Gunn [Fri, 12 Feb 2016 03:40:08 +0000 (03:40 +0000)]
Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev
Jorim Jaggi [Fri, 12 Feb 2016 03:18:47 +0000 (19:18 -0800)]
Fix NullPointerException
Change-Id: Ifce7af5ac6aacc04fb621f3afd707164f36ba980
Jorim Jaggi [Fri, 12 Feb 2016 03:12:17 +0000 (03:12 +0000)]
Merge "Handle light status bar for split-screen" into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 02:51:16 +0000 (02:51 +0000)]
Merge "Add error message for locked device." into nyc-dev
Daichi Hirono [Thu, 11 Feb 2016 00:55:37 +0000 (16:55 -0800)]
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
Daichi Hirono [Fri, 12 Feb 2016 02:38:29 +0000 (02:38 +0000)]
Merge "Open the connected device in Files app when tapping notification." into nyc-dev
Jim Miller [Mon, 8 Feb 2016 21:58:21 +0000 (13:58 -0800)]
Update FBE notification strings
Fixes bug
26863154
Change-Id: I6b130a8ba6e21e2cbd47551aabf5fc3e31f6f1c0
(cherry picked from commit
6338561c925fc4885275949d29193c14e83db71f)
Adam Lesinski [Fri, 12 Feb 2016 01:42:16 +0000 (01:42 +0000)]
Merge "AAPT: Remove warnings for public resources without comments" into nyc-dev
Fyodor Kupolov [Fri, 12 Feb 2016 01:37:37 +0000 (01:37 +0000)]
Merge "Clear calling identity before setting restrictions" into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 01:02:52 +0000 (01:02 +0000)]
Merge "Show specific error message for busy device." into nyc-dev
Daichi Hirono [Fri, 12 Feb 2016 00:51:28 +0000 (00:51 +0000)]
Merge "Returns "application/octet-stream" for unknown types of MTP files." into nyc-dev
Felipe Leme [Fri, 12 Feb 2016 00:50:46 +0000 (00:50 +0000)]
Merge "Optimized add|removeRestrictBackgroundWhitelistedUid()." into nyc-dev
Phil Burk [Fri, 12 Feb 2016 00:42:13 +0000 (16:42 -0800)]
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>
Felipe Leme [Fri, 12 Feb 2016 00:40:40 +0000 (00:40 +0000)]
Merge "Split bugreport identifier into id and pid." into nyc-dev
Daichi Hirono [Thu, 11 Feb 2016 18:08:21 +0000 (10:08 -0800)]
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
Etan Cohen [Fri, 12 Feb 2016 00:35:10 +0000 (00:35 +0000)]
NAN: Disable all DBG flags.
am:
7d6c389edf
* commit '
7d6c389edf41ef8ce490fa7af963484f9502cbc1':
NAN: Disable all DBG flags.
Winson Chung [Fri, 12 Feb 2016 00:29:42 +0000 (00:29 +0000)]
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.
Tomasz Mikolajewski [Fri, 12 Feb 2016 00:26:44 +0000 (00:26 +0000)]
Merge "Fix arguments order in DocumentsContract.moveDocument()." into nyc-dev
Jae Seo [Fri, 12 Feb 2016 00:05:00 +0000 (00:05 +0000)]
Merge "TIF: Separate service connection errors from recording errors" into nyc-dev
Fyodor Kupolov [Fri, 12 Feb 2016 00:04:03 +0000 (00:04 +0000)]
Merge "During update enable system apps for requested users only" into nyc-dev
Omkar Kolangade [Tue, 5 May 2015 00:49:14 +0000 (17:49 -0700)]
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
Jae Seo [Thu, 11 Feb 2016 08:59:10 +0000 (00:59 -0800)]
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
Rob Carr [Thu, 11 Feb 2016 23:06:25 +0000 (23:06 +0000)]
Merge "Correct error in window lifetime." into nyc-dev
Etan Cohen [Thu, 11 Feb 2016 22:57:00 +0000 (14:57 -0800)]
NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
Shreyas Basarge [Thu, 11 Feb 2016 17:06:13 +0000 (17:06 +0000)]
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
John Reck [Thu, 11 Feb 2016 22:35:35 +0000 (22:35 +0000)]
Merge "Fix build" into nyc-dev
John Reck [Thu, 11 Feb 2016 22:35:08 +0000 (14:35 -0800)]
Fix build
Change-Id: Id793d3a824902ab794b5d5a4cdf4c77a72c52add
Ben Kwa [Thu, 11 Feb 2016 22:18:53 +0000 (22:18 +0000)]
Merge "Handle spacebar events." into nyc-dev
Adam Lesinski [Thu, 11 Feb 2016 22:17:25 +0000 (14:17 -0800)]
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
John Reck [Thu, 11 Feb 2016 22:05:14 +0000 (22:05 +0000)]
Merge "Fix bpp mismatch" into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:29:12 +0000 (13:29 -0800)]
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
John Reck [Thu, 11 Feb 2016 21:22:25 +0000 (13:22 -0800)]
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
Ben Kwa [Thu, 11 Feb 2016 21:20:07 +0000 (21:20 +0000)]
Merge "Revert "Handle spacebar events."" into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:19:54 +0000 (21:19 +0000)]
Revert "Handle spacebar events."
This reverts commit
ef8eb5c9dd45cc94219d6e889d026f53ecc5c7e9.
Change-Id: I6c473d09eae8289da1deb86a8f043aa88de4c6f0
Ben Kwa [Wed, 10 Feb 2016 19:54:55 +0000 (11:54 -0800)]
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)
Ben Kwa [Thu, 11 Feb 2016 21:08:52 +0000 (21:08 +0000)]
Merge "Allow multiple range selections using the shift key." into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:07:11 +0000 (21:07 +0000)]
Merge "Handle shift-enter key events." into nyc-dev
Ben Kwa [Thu, 11 Feb 2016 21:06:51 +0000 (21:06 +0000)]
Merge "Handle spacebar events." into nyc-dev
Lifu Tang [Thu, 11 Feb 2016 21:06:00 +0000 (21:06 +0000)]
Merge "Fixed the build break" into nyc-dev
Ben Kwa [Wed, 10 Feb 2016 22:01:19 +0000 (14:01 -0800)]
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)
Phil Weaver [Thu, 11 Feb 2016 20:58:30 +0000 (20:58 +0000)]
Merge "Fix ViewPager crash for a11y z order." into nyc-dev
Lifu Tang [Thu, 11 Feb 2016 20:57:59 +0000 (12:57 -0800)]
Fixed the build break
Change-Id: I02ee9b3f44d79510f174a1041f28b9c60450aa9c
Ben Kwa [Wed, 10 Feb 2016 16:57:25 +0000 (08:57 -0800)]
Handle shift-enter key events.
Shift-enter toggles selection on the focused item.
BUG=
25196158
Change-Id: I261c249cdf1856d134910a4767b0daf8963d5b68
(cherry picked from commit
e0e36df29484bf6b0b34fb958701ed7ddd96a40a)
Ben Kwa [Wed, 10 Feb 2016 16:58:48 +0000 (08:58 -0800)]
Handle spacebar events.
Space/Shift-space scrolls the files list up/down.
BUG=
25195555
Change-Id: Ib6351831db77a930920610106cc1da2b710532c6
(cherry picked from commit
870fea3b03d94335b9c7234103bde8fbf813743f)
Hall Liu [Thu, 11 Feb 2016 20:51:56 +0000 (20:51 +0000)]
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
Daichi Hirono [Wed, 10 Feb 2016 22:59:52 +0000 (14:59 -0800)]
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
Daichi Hirono [Thu, 11 Feb 2016 19:40:47 +0000 (11:40 -0800)]
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
Sergey Poromov [Thu, 11 Feb 2016 20:36:32 +0000 (20:36 +0000)]
Merge "Don't call BackupTransport#checkFullBackupSize when preflight timeouted." into nyc-dev
Jorim Jaggi [Wed, 10 Feb 2016 05:36:09 +0000 (21:36 -0800)]
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
Lifu Tang [Thu, 11 Feb 2016 20:10:10 +0000 (20:10 +0000)]
Merge "Optimized the memory consumption and renamed PRN" into nyc-dev
Paul Stewart [Thu, 11 Feb 2016 20:07:26 +0000 (20:07 +0000)]
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
Chong Zhang [Thu, 11 Feb 2016 20:05:58 +0000 (20:05 +0000)]
Merge "Mark activity as visible and not stopped after resume-relaunch." into nyc-dev
Winson [Tue, 9 Feb 2016 20:31:00 +0000 (12:31 -0800)]
Adding view debug annotations to simplifying debugging state.
Change-Id: If90955f44be55ff09208998214bc1bb47f93a872
Paul Stewart [Thu, 11 Feb 2016 20:01:18 +0000 (20:01 +0000)]
Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev
Chong Zhang [Thu, 11 Feb 2016 02:47:06 +0000 (18:47 -0800)]
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
Winson [Tue, 9 Feb 2016 19:53:27 +0000 (11:53 -0800)]
Disallow launching third party apps in safe mode.
- Also desaturates out the disabled task
Bug:
25785926
Change-Id: I9fa48c062cfaf6d9cb60a9e49291ca6e15c6b343
Winson Chung [Fri, 5 Feb 2016 17:55:56 +0000 (17:55 +0000)]
Drawing thumbnail background color for empty space in view.
Change-Id: I2e8dfbe9c11a61876956658eff0674adb26d855d
Signed-off-by: Winson <winsonc@google.com>
Makoto Onuki [Thu, 11 Feb 2016 19:42:53 +0000 (19:42 +0000)]
Merge "If package has no active admins, just uninstall right away" into nyc-dev
Robert Carr [Thu, 11 Feb 2016 05:20:21 +0000 (21:20 -0800)]
Correct error in window lifetime.
Correct a simple logic error where application stop state is incorrectly
reset.
Bug:
27112965
Change-Id: I3058378c1e240e0a02665ad479678723e14921aa
Selim Cinek [Thu, 11 Feb 2016 19:37:49 +0000 (19:37 +0000)]
Merge "Added support for media notifications without expanded state" into nyc-dev
Lifu Tang [Mon, 8 Feb 2016 02:08:19 +0000 (18:08 -0800)]
Optimized the memory consumption and renamed PRN
Bug:
27058251
Change-Id: I2309943b1a4e7565868ed0f247b84edc631fbd59
Kenny Guy [Thu, 11 Feb 2016 19:27:21 +0000 (19:27 +0000)]
Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev
Paul Stewart [Thu, 11 Feb 2016 19:08:24 +0000 (11:08 -0800)]
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
Wale Ogunwale [Thu, 11 Feb 2016 18:55:49 +0000 (18:55 +0000)]
Merge "Force pre-N apps to be resizeable." into nyc-dev
Jeremy Joslin [Thu, 11 Feb 2016 18:55:37 +0000 (18:55 +0000)]
Merge "Send explicit broadcasts when the scorer changes." into nyc-dev
Andrei Stingaceanu [Thu, 11 Feb 2016 18:47:59 +0000 (18:47 +0000)]
Merge "Suspend apps - disable audio/vibrations" into nyc-dev
Hall Liu [Fri, 8 Jan 2016 01:35:54 +0000 (17:35 -0800)]
Initialize MD5 in logging in background
Use a background task to call MessageDigest.getInstance in order to
avoid a possible disk read on initialization.
Bug:
26069217
Change-Id: I0091ce012bcd811dfca0e85c21a12c54913ed919
Raph Levien [Thu, 11 Feb 2016 18:35:35 +0000 (18:35 +0000)]
Merge "Allow null string to BidiFormatter#unicodeWrap" into nyc-dev
Daniel U [Wed, 3 Feb 2016 14:29:09 +0000 (14:29 +0000)]
Adopt HTML/CSS color values in fromHtml()
- "green", "gray/grey", "lightgray/lightgrey", and
"darkgray/darkgrey" have different values in HTML/CSS.
- Adopt HTML/CSS color values according to user specified
option flag.
- Remove support to "@color" notation as it is not standard
HTML/CSS.
- Replace SPAN_MARK_MARK with SPAN_INCLUSIVE_EXCLUSIVE
consistency.
BUG:
26950749
Change-Id: I5b33282368042f74f1b4768e096aae3e5bf45de6
Gustav Sennton [Thu, 11 Feb 2016 12:51:27 +0000 (12:51 +0000)]
Move current WebView provider from Settings.Secure to Settings.Global
The current WebView provider is not user-specific and should therefore
be stored as a Global rather than a Secure setting.
Also do some code cleaning including a fix in WebViewProviderInfo to
always fetch up-to-date information about whether a webview
implementation package is enabled.
Bug:
27142972
Change-Id: I4d4b8fca775e97980fb5c34313be6d82472e7d33
Hall Liu [Thu, 11 Feb 2016 18:16:08 +0000 (18:16 +0000)]
Merge "Initialize MD5 in logging in background" into cw-e-dev
am:
5839e7804c
* commit '
5839e7804c717f3b398fd777540e2297e8c85300':
Initialize MD5 in logging in background
Gustav Sennton [Thu, 11 Feb 2016 18:14:45 +0000 (18:14 +0000)]
Merge "Allow using USER_ALL as user id when killing package dependents." into nyc-dev
Hall Liu [Thu, 11 Feb 2016 18:10:31 +0000 (18:10 +0000)]
Merge "Initialize MD5 in logging in background" into cw-e-dev
Kenny Guy [Thu, 11 Feb 2016 17:11:14 +0000 (17:11 +0000)]
DPMS shouldn't remove admins that aren't crypto aware.
DevicePolicyManagerService checks admins on boot
and removes ones that aren't found so it needs
to match crypto and non-crypto admins.
Match non-crypto aware apps when admin is enabling
system apps.
Bug:
27126412
Change-Id: Ibb20841679fb660de281782964b068d5a13b8fe9
Philipp Weiß [Thu, 11 Feb 2016 17:17:38 +0000 (17:17 +0000)]
Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev
Andrei Stingaceanu [Thu, 11 Feb 2016 16:23:49 +0000 (16:23 +0000)]
Suspend apps - disable audio/vibrations
Do not allow audio or vibrations for suspended apps.
Bug:
22776761
Bug:
26949521
Bug:
26954754
Bug:
26953560
Change-Id: I181288823e38efdb1631bc26ee23278697eeb0f5
Jerome Gaillard [Thu, 11 Feb 2016 17:12:08 +0000 (17:12 +0000)]
Merge branch 'nyc-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev
Jerome Gaillard [Thu, 11 Feb 2016 17:11:33 +0000 (17:11 +0000)]
Layoutlib supports rounded corners of different sizes am:
3381cde9f2
am:
6f35d2c6ea
* commit '
6f35d2c6ea1d18decd6b646035fd02fd5b1f0256':
Layoutlib supports rounded corners of different sizes
Przemyslaw Szczepaniak [Thu, 11 Feb 2016 17:10:55 +0000 (17:10 +0000)]
Merge "Remove java.nio.channels.* classes without test coverage." into nyc-dev
Shreyas Basarge [Thu, 11 Feb 2016 17:09:29 +0000 (17:09 +0000)]
Merge "Fix ConcurrentModificationException in SyncManager" into nyc-dev
John Reck [Thu, 11 Feb 2016 17:02:47 +0000 (17:02 +0000)]
Merge "Revert "VectorDrawable native rendering - Step 5 of MANY"" into nyc-dev
John Reck [Thu, 11 Feb 2016 17:02:33 +0000 (17:02 +0000)]
Revert "VectorDrawable native rendering - Step 5 of MANY"
Bug:
27136799
This reverts commit
18bdf443e371e9f293439b4ff92cc79abaa422e5.
Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
Jerome Gaillard [Thu, 11 Feb 2016 16:57:48 +0000 (16:57 +0000)]
Layoutlib supports rounded corners of different sizes
am:
3381cde9f2
* commit '
3381cde9f293c52f195b31b0e4049649db31181a':
Layoutlib supports rounded corners of different sizes
Shreyas Basarge [Thu, 11 Feb 2016 14:52:47 +0000 (14:52 +0000)]
Fix ConcurrentModificationException in SyncManager
ConcurrentModificationException would be thrown because
we didn't break from the for loop after removing an
entry from the collection we were looping over.
Change-Id: I30435670f76f60b238e29658611b06ec789219aa
Bug:
27136502
(cherry picked from commit
12832e3291a66bcab12edd5943767c7827c3f7c6)
Jason Monk [Thu, 11 Feb 2016 16:41:24 +0000 (16:41 +0000)]
Merge "Guard against monkey crash" into nyc-dev
Jason Monk [Thu, 11 Feb 2016 16:37:24 +0000 (11:37 -0500)]
Guard against monkey crash
Bug:
27099281
Change-Id: I58951ee7ff5f14f5c2d60e450ed3b0fa7bf31e8e
Andreas Gampe [Thu, 11 Feb 2016 16:26:18 +0000 (16:26 +0000)]
Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev
Jeremy Joslin [Thu, 11 Feb 2016 15:59:36 +0000 (15:59 +0000)]
Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev
am:
3d4acbf5fb
* commit '
3d4acbf5fbe74133b70b0bec51a387428f251ac1':
New systemapi to mark a wifi network as metered.