Robert Sesek
f43d5b36d6
Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-10-13 18:55:37 +00:00
Adrian Roos
7bc84b803d
Fix Notification.Action.Builder copy constructor am: 7af5362571
...
am: 342bc437bf
2016-10-12 23:25:20 +00:00
Adrian Roos
342bc437bf
Fix Notification.Action.Builder copy constructor
...
am: 7af5362571
2016-10-12 23:19:19 +00:00
Adrian Roos
7af5362571
Fix Notification.Action.Builder copy constructor
...
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.
Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
2016-10-12 15:19:55 -07:00
Robert Sesek
d414158f79
resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp
...
Change-Id: I71fbde71dd97abab77f798b621972fb1d26af799
2016-10-12 15:03:19 -04:00
Alan Viverette
0754f59c4a
Add note about density scaling behavior to setImageURI am: ac21e56f63
...
am: 74c6d9bd3f
2016-10-12 01:42:06 +00:00
Alan Viverette
74c6d9bd3f
Add note about density scaling behavior to setImageURI
...
am: ac21e56f63
2016-10-12 01:36:33 +00:00
Chet Haase
3267a2462d
Fix small typo in ShortcutManager header docs am: c158431f8e
...
am: 5aa0dfcc0a
2016-10-12 00:31:31 +00:00
Chet Haase
5aa0dfcc0a
Fix small typo in ShortcutManager header docs
...
am: c158431f8e
2016-10-12 00:19:46 +00:00
Alan Viverette
ac21e56f63
Add note about density scaling behavior to setImageURI
...
Bug: 27327999
Change-Id: I1e348a1fbda20fff9575261df7097fbd46381383
2016-10-11 23:32:10 +00:00
Chet Haase
c158431f8e
Fix small typo in ShortcutManager header docs
...
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
2016-10-11 21:48:55 +00:00
Nick Kralevich
34547a8dc2
Delete "Show CPU usage" am: fc4a5c2d85
...
am: f0c0188a8a
2016-10-11 18:15:23 +00:00
Nick Kralevich
f0c0188a8a
Delete "Show CPU usage"
...
am: fc4a5c2d85
2016-10-11 18:09:10 +00:00
Nick Kralevich
ab7a44b41a
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
2016-10-11 18:03:29 +00:00
Nick Kralevich
fc4a5c2d85
Delete "Show CPU usage"
...
This functionality hasn't worked since Lollipop.
Bug: 21388590
Change-Id: Ie4388d88f6e06f3e2d2e84e9c4515b3ebc6a0ea5
2016-10-11 09:01:38 -07:00
Jeff Sharkey
6f5f03b8c1
Set MIME type when building BROWSE intents. am: 42a4aaab44
...
am: ac184d3c46
2016-10-10 23:34:28 +00:00
Jeff Sharkey
ac184d3c46
Set MIME type when building BROWSE intents.
...
am: 42a4aaab44
2016-10-10 23:29:28 +00:00
Jeff Sharkey
42a4aaab44
Set MIME type when building BROWSE intents.
...
If we created a BROWSE PendingIntent early during boot (while the
device was still locked), we would resolve the MIME type as "null"
meaning the intent would fail to launch.
Since we always know what the MIME type will be, set it explicitly.
Test: boot device while USB device attached
Bug: 30742481
Change-Id: I23c523cbe2660ca63a3b7df1f41300ab803b314c
2016-10-10 21:28:40 +00:00
Tobias Sargeant
7031dacaf5
Refactor ZygoteInit to support a WebView-specific zygote.
...
am: dd4bb31639
2016-10-10 21:12:49 +00:00
Tobias Sargeant
dd4bb31639
Refactor ZygoteInit to support a WebView-specific zygote.
...
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.
* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.
Bug: 22084679
Bug: 21643067
(cherry picked from commit ba816e0c9eb9679dc1fa
2016-10-07 14:25:20 -07:00
Alex Hills
21863add46
Updates documentation for MessagingStyle constructor am: fd590441c1
...
am: d86df31497
2016-10-07 20:50:26 +00:00
Alan Viverette
36d83ffc5b
Scale bitmap shaders for target density am: 0d2a46b733
...
am: 444f2043d1
2016-10-07 20:46:37 +00:00
Alex Hills
d86df31497
Updates documentation for MessagingStyle constructor
...
am: fd590441c1
2016-10-07 20:43:57 +00:00
Alan Viverette
444f2043d1
Scale bitmap shaders for target density
...
am: 0d2a46b733
2016-10-07 20:39:48 +00:00
TreeHugger Robot
67c70a263c
Merge "Updates documentation for MessagingStyle constructor" into nyc-mr1-dev
2016-10-07 20:34:50 +00:00
TreeHugger Robot
0f6cec369f
Merge "Scale bitmap shaders for target density" into nyc-mr1-dev
2016-10-07 20:31:01 +00:00
Alan Viverette
0d2a46b733
Scale bitmap shaders for target density
...
Also fixes progress bar sample tile to reflect density and ensures
that ProgressBar.tileify() clones inner drawables into the correct
density.
Bug: 31841123
Test: BitmapDrawableTest#testPreloadDensity()
Test: ThemeHostTest
Test: Visual inspection of ApiDemos
Change-Id: I9dcb9817d8d91d61ff0215987247e9e7fb089c46
2016-10-07 16:23:32 -04:00
Robert Carr
3d2783c82b
When adding dialog window but not creating update the configuration. am: d7dbec7e4c
...
am: 7696b0d06b
2016-10-07 19:29:56 +00:00
Robert Carr
7696b0d06b
When adding dialog window but not creating update the configuration.
...
am: d7dbec7e4c
2016-10-07 19:21:51 +00:00
Rob Carr
93becf5148
Merge "When adding dialog window but not creating update the configuration." into nyc-mr1-dev
2016-10-07 19:16:02 +00:00
Nancy Zheng
ce2cef46b3
Fix race condition in checkPattern and verifyPattern.
...
am: 9475460e66
2016-10-07 18:00:24 +00:00
Nancy Zheng
1e746a415d
Merge "Fix race condition in checkPattern and verifyPattern." into cw-f-dev
2016-10-07 17:47:47 +00:00
Nancy Zheng
9475460e66
Fix race condition in checkPattern and verifyPattern.
...
Bug: 31939282
Change-Id: I3250ab900f190ca9c820ac355ce94a699315b137
2016-10-07 10:41:00 -07:00
Alex Hills
fd590441c1
Updates documentation for MessagingStyle constructor
...
MessagingStyle expects the field userReplyName to be non-null, but the
documentation doesn't describe it as such. This updates the documentation
to say the field is required, and adds a NonNull annotation.
This has no behavior changes.
BUG:31747744
Change-Id: If832d059c276e856fba366dabfa8a5821bb63054
2016-10-07 15:44:23 +00:00
Dimitry Ivanov
629ad7e37e
Merge "Relax namespace restriction on system server classloader" am: a8135325c1 am: 3c6b4961cb
...
am: 097ff24545
2016-10-07 09:00:19 +00:00
Dimitry Ivanov
097ff24545
Merge "Relax namespace restriction on system server classloader" am: a8135325c1
...
am: 3c6b4961cb
2016-10-07 08:53:06 +00:00
Dimitry Ivanov
3c6b4961cb
Merge "Relax namespace restriction on system server classloader"
...
am: a8135325c1
2016-10-07 08:45:18 +00:00
Dimitry Ivanov
a8135325c1
Merge "Relax namespace restriction on system server classloader"
2016-10-07 08:34:41 +00:00
Hugo Benichi
7720c01fcf
Reject DHCP packets with no magic cookie am: 006e061301
...
am: 1ade34dd76
2016-10-07 02:36:53 +00:00
Hugo Benichi
1ade34dd76
Reject DHCP packets with no magic cookie
...
am: 006e061301
2016-10-07 02:29:49 +00:00
Hugo Benichi
ea2f7a4f05
Merge "Reject DHCP packets with no magic cookie" into nyc-mr1-dev
2016-10-07 02:22:35 +00:00
Hugo Benichi
9f713864ca
Catch runtime exceptions when parsing DHCP packets am: e0ea7fecd6
...
am: c4a13afe92
2016-10-06 21:45:08 +00:00
Dianne Hackborn
a89e1ec692
Fix issue #31305336 : File corrupt: too many wake locks 101 am: cb99a72e62
...
am: 50b9f3513c
2016-10-06 21:27:35 +00:00
Jakub Pawlowski
4984d66b6a
Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739 am: 6fe3900791
...
am: 56757a44a6
2016-10-06 21:12:06 +00:00
Hugo Benichi
c4a13afe92
Catch runtime exceptions when parsing DHCP packets
...
am: e0ea7fecd6
2016-10-06 21:11:47 +00:00
Jakub Pawlowski
56757a44a6
Merge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739
...
am: 6fe3900791
2016-10-06 21:07:44 +00:00
Jakub Pawlowski
6fe3900791
Merge "Fix connecting to profiles when bonding from local device (1/3)"
...
am: 44c013d739
2016-10-06 21:00:51 +00:00
Dianne Hackborn
50b9f3513c
Fix issue #31305336 : File corrupt: too many wake locks 101
...
am: cb99a72e62
2016-10-06 20:58:54 +00:00
Christopher Tate
79a3ee5a98
Explicitly close FD binder parameters in backup/restore API calls am: 91bb0e5cca
...
am: 3fa99a6d11
2016-10-06 20:36:26 +00:00
Christopher Tate
3fa99a6d11
Explicitly close FD binder parameters in backup/restore API calls
...
am: 91bb0e5cca
2016-10-06 20:10:56 +00:00
