OSDN Git Service
Jim Miller [Fri, 19 Aug 2016 20:31:34 +0000 (20:31 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours
am:
f159feff98
Change-Id: I1064ef601b45a43ea248fbf6d5dd0194d0d61288
Jim Miller [Fri, 19 Aug 2016 20:23:45 +0000 (20:23 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991
am:
85c390e9fb -s ours
Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
Sudheer Shanka [Fri, 19 Aug 2016 18:09:57 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours
am:
e49de5e073
Change-Id: I2213eaf49053cc4ac01746411fc7a35c6b0477b4
Amith Yamasani [Fri, 19 Aug 2016 18:09:53 +0000 (18:09 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours
am:
f705730667
Change-Id: Ic8bc51f29553e19aabd44f8123d6434ed36d15a2
Sudheer Shanka [Fri, 19 Aug 2016 18:02:26 +0000 (18:02 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9
am:
58def3804c -s ours
Change-Id: I83e7f1e64a965a7550629d2a891445dab11a8d8d
Amith Yamasani [Fri, 19 Aug 2016 18:02:22 +0000 (18:02 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365
am:
5841c492a7 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:31:47 +0000 (17:31 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am:
badc5cd942
Change-Id: I3c783e856777500d86cc5ae162ab82a727e42967
Amith Yamasani [Fri, 19 Aug 2016 17:31:40 +0000 (17:31 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
55eacb9441
Change-Id: Id1ee0a3dd76a7bb549838e9d74b9927956b96570
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:06:47 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug
30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
Scott Main [Fri, 19 Aug 2016 01:12:12 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
smain@google.com [Fri, 19 Aug 2016 01:12:08 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
Ajay Panicker [Thu, 18 Aug 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68
am:
779a1f096c
Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
Ajay Panicker [Thu, 18 Aug 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Protect various Bluetooth broadcasts"
am:
53ff75bb68
Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
Treehugger Robot [Thu, 18 Aug 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Protect various Bluetooth broadcasts"
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit
9a236066dbf604edfd5f873b4a3b94a200efd628)
Narayan Kamath [Thu, 18 Aug 2016 10:20:01 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
Narayan Kamath [Thu, 18 Aug 2016 10:19:58 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Dmitriy Filchenko [Thu, 18 Aug 2016 03:27:54 +0000 (03:27 +0000)]
Merge "Remove unused includes." am:
35da832634
am:
33e65232f3
Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
Dmitriy Filchenko [Thu, 18 Aug 2016 03:22:39 +0000 (03:22 +0000)]
Merge "Remove unused includes."
am:
35da832634
Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
Treehugger Robot [Thu, 18 Aug 2016 03:17:04 +0000 (03:17 +0000)]
Merge "Remove unused includes."
Dmitriy Filchenko [Thu, 18 Aug 2016 00:55:24 +0000 (17:55 -0700)]
Remove unused includes.
BUG:
29824203
Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
Jim Miller [Wed, 17 Aug 2016 23:31:06 +0000 (23:31 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e am:
cb83f6188b
am:
e3457fc127
Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332
Dirk Dougherty [Wed, 17 Aug 2016 23:25:42 +0000 (23:25 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
am:
96855c49a6
Change-Id: If3b5e4b033c0038bddaf873108406c9374979c06
Dirk Dougherty [Wed, 17 Aug 2016 23:25:38 +0000 (23:25 +0000)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
am:
b042ab1eb6
Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
Jim Miller [Wed, 17 Aug 2016 23:22:33 +0000 (23:22 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c am:
229de7088e
am:
cb83f6188b
Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Dirk Dougherty [Wed, 17 Aug 2016 22:53:23 +0000 (22:53 +0000)]
Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev
Glenn Kasten [Wed, 17 Aug 2016 21:07:54 +0000 (21:07 +0000)]
resolve merge conflicts of
c76a3ac to stage-aosp-master
am:
67ffd5e617
Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b
Glenn Kasten [Wed, 17 Aug 2016 20:27:29 +0000 (13:27 -0700)]
resolve merge conflicts of
c76a3ac to stage-aosp-master
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
Hemal Patel [Wed, 17 Aug 2016 19:45:03 +0000 (19:45 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am:
c7902aa4bb
am:
5e086dc3bb
Change-Id: I78fcea831565d461550df03544531756c465ef1e
Hemal Patel [Wed, 17 Aug 2016 19:44:56 +0000 (19:44 +0000)]
Docs: Renamed Google Now to Google Voice Actions am:
86bbfaabdd
am:
00ff40145d
Change-Id: I5d289bec45dbb6a3c0c6fba7ff760fa111aa6622
Hemal Patel [Wed, 17 Aug 2016 19:37:17 +0000 (19:37 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
am:
c7902aa4bb
Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
Hemal Patel [Wed, 17 Aug 2016 19:37:14 +0000 (19:37 +0000)]
Docs: Renamed Google Now to Google Voice Actions
am:
86bbfaabdd
Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
Hemal Patel [Wed, 17 Aug 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs
Chih-hung Hsieh [Wed, 17 Aug 2016 18:18:22 +0000 (18:18 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time." am:
67d47e0ca6
am:
9b36ce973e
Change-Id: I8a9e9d09a48da636a8256aec1c0000441d986d4e
Eric Schmidt [Wed, 17 Aug 2016 18:06:55 +0000 (18:06 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7
am:
39cc61a4db
Change-Id: I68dd3b9ebc95fe57fe9e4553f87774c69bb10df1
Chih-hung Hsieh [Wed, 17 Aug 2016 18:06:22 +0000 (18:06 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time."
am:
67d47e0ca6
Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
Glenn Kasten [Wed, 17 Aug 2016 18:02:53 +0000 (18:02 +0000)]
Merge "Squashed commit of the following:"
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:57 +0000 (17:54 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am:
6f15eabd29" into nyc-dev-plus-aosp
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:51 +0000 (17:54 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7 am:
c89c8c3e37" into nyc-dev-plus-aosp
Eric Schmidt [Wed, 17 Aug 2016 17:54:21 +0000 (17:54 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am:
32cc6b7fb7
am:
c89c8c3e37
Change-Id: I0193239ada03ca2e5bc5ab856f778f69a691b325
Tobias Thierer [Wed, 17 Aug 2016 17:54:12 +0000 (17:54 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
am:
6f15eabd29
Change-Id: Ic1c3c789ffdc7b9d1f59faea6292c8f3489e8ad4
Tobias Thierer [Wed, 17 Aug 2016 17:54:08 +0000 (17:54 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
am:
7f5095ddfe
Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am:
085994c40d
Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
Chih-hung Hsieh [Wed, 17 Aug 2016 17:42:52 +0000 (17:42 +0000)]
Merge "Fix google-explicit-constructor warnings in common_time."
Tobias Thierer [Wed, 17 Aug 2016 17:38:46 +0000 (17:38 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
Eric Schmidt [Wed, 17 Aug 2016 17:14:11 +0000 (17:14 +0000)]
docs: Fixed code snippet in notify-user/navigation.html
am:
32cc6b7fb7
Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
Tobias Thierer [Wed, 17 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.
This reverts commit
778321361132672ea1174e4ca3f5397477c32690.
Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
Phil Burk [Wed, 17 Aug 2016 17:03:47 +0000 (17:03 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()" am:
c5b376ab66
am:
86fbbfb6f0
Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853
Tobias Thierer [Wed, 17 Aug 2016 17:03:44 +0000 (17:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60." am:
ec6a323da2
am:
17fea8b967
Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
Phil Burk [Wed, 17 Aug 2016 16:59:06 +0000 (16:59 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
am:
c5b376ab66
Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
Tobias Thierer [Wed, 17 Aug 2016 16:54:30 +0000 (16:54 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
am:
ec6a323da2
Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
Tobias Thierer [Wed, 17 Aug 2016 16:54:08 +0000 (16:54 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
am:
7783213611
Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
Tobias Thierer [Wed, 17 Aug 2016 16:54:05 +0000 (16:54 +0000)]
Track libcore update of Map classes to jdk8u60
am:
fb2ade3dca
Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
Glenn Kasten [Wed, 17 Aug 2016 15:45:39 +0000 (08:45 -0700)]
Squashed commit of the following:
commit
efa6f355b06675aa4d0879fd279e22c16d5c046c
Author: Mikhail Naganov <mnaganov@google.com>
Date: Wed Aug 10 12:25:13 2016 -0700
MIDI: Use server-side socket in blocking mode for virtual devices
Since virtual MIDI servers may misbehave, blocking mode will throttle
them if clients are not coping with their sending speed.
Bug:
29413812
Change-Id: I9c4a2a7a7ea3ea060c93fedc7d0f033427c557c9
commit
755dfb5f83749d3963c63d98d692307f8271c804
Author: Mikhail Naganov <mnaganov@google.com>
Date: Fri Jul 8 13:26:19 2016 -0700
Protect MIDI framework against client blocks in MidiReceiver.onSend
Make the server-side socket non-blocking when creating MidiOutputPort
for clients. Thus if a client ceases to read from its side of the
socket pair, the server will just fail to write instead of blocking.
One drawback is that the MidiOutputPort on the client can't indicate
that it has become dysfunctional, but it's not possible without
changing the API.
Bug:
29413812
Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a
commit
c740b13953761f58233ac651a0b5227733b1bdcc
Author: Mikhail Naganov <mnaganov@google.com>
Date: Fri Jun 17 04:11:25 2016 -0700
UsbMidiDevice: Clean up terminology and fix comments
When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.
Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.
Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2
commit
4269c6417287737624f6165a8bbeb5aa427de9a0
Author: Glenn Kasten <gkasten@google.com>
Date: Thu May 5 18:49:16 2016 -0700
Update MIDI package summary
Bug:
28625060
Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324
commit
862d40b73168bde7d0be5280d997985c18061014
Author: Phil Burk <philburk@google.com>
Date: Tue Apr 19 15:56:24 2016 -0700
MidiDevice: do not open ports on closed device
Fix involves client side mIsDeviceClosed flag.
Bug:
24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
commit
6f1de358b9f2616e03f4655f01454770915ddd66
Author: Phil Burk <philburk@google.com>
Date: Mon Apr 18 16:05:28 2016 -0700
MidiService: fix resource leak
The proxy object was being used to match when adding or removing objects.
But they are different each time. So now we use an asBinder() object.
Bug:
28153736
Change-Id: I1bccebf1e9464668db757ff08b41902d0cf0e3a7
Signed-off-by: Phil Burk <philburk@google.com>
commit
f7386bd535bb8a1d7f8df8f44a1748ab770c991a
Author: Phil Burk <philburk@google.com>
Date: Tue Apr 5 14:19:53 2016 -0700
MidiDevice: fix connectPorts for same Process
If connectPorts() was called for a device in the same process then
the connection would die when the ParcelFileDescriptor was closed.
Bug:
26406775
Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
Signed-off-by: Phil Burk <philburk@google.com>
Change-Id: I4dfc2a2cbaf04bf1a790ae2cb39bf74fb5bb16ac
Tobias Thierer [Wed, 17 Aug 2016 14:50:59 +0000 (14:50 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.
Bug:
30911913
This reverts commit
fb2ade3dcab0962f18acab720875c75622f412ed.
Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
Treehugger Robot [Wed, 17 Aug 2016 13:57:33 +0000 (13:57 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
Tobias Thierer [Thu, 11 Aug 2016 18:47:02 +0000 (19:47 +0100)]
Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640
This CL requires base CLs, which will get merged from aosp-master,
in order to build.
Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
Tobias Thierer [Wed, 17 Aug 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
Phil Burk [Tue, 5 Apr 2016 18:25:36 +0000 (11:25 -0700)]
UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.
Bug:
25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
Andrew Solovay [Tue, 2 Aug 2016 21:24:58 +0000 (14:24 -0700)]
docs: Docs for Support Library 24.2.0 release
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.
Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.
See first comment for doc stage location.
bug:
30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
Eric Schmidt [Thu, 11 Aug 2016 19:54:31 +0000 (12:54 -0700)]
docs: Fixed code snippet in notify-user/navigation.html
Bug:
25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
Tobias Thierer [Fri, 5 Aug 2016 18:58:02 +0000 (19:58 +0100)]
Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.
Test: make update-api
Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:31:42 +0000 (02:31 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea537bf5b3
am:
9c0b881c9d
Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:23:48 +0000 (02:23 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea537bf5b3
Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."
Dirk Dougherty [Tue, 16 Aug 2016 01:29:51 +0000 (01:29 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am:
114c09498d
Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a
Dirk Dougherty [Tue, 16 Aug 2016 01:29:47 +0000 (01:29 +0000)]
Doc change: escape lt char in generic type in pre block.
am:
1035b25825
Change-Id: Iecc647ac91d9d6d452091c214138a6e650babac0
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Jim Miller [Wed, 10 Aug 2016 22:43:17 +0000 (15:43 -0700)]
Fix vulnerability in LockSettings service
Fixes bug
30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:51:48 +0000 (14:51 -0700)]
Fix google-explicit-constructor warnings in common_time.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: Ieab4756042e77cfadda35e34f78f515058ae0bb3
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:45:02 +0000 (14:45 -0700)]
Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
Julius D'souza [Mon, 15 Aug 2016 19:47:43 +0000 (19:47 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours
am:
f51dfc24d1 -s ours
Change-Id: I1afeaa3f5321c536cad22455881b36582b468748
Julius D'souza [Mon, 15 Aug 2016 19:33:29 +0000 (19:33 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours
am:
0903c5fe7a -s ours
Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
David Gross [Mon, 15 Aug 2016 17:23:24 +0000 (17:23 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
am:
8cb4ca439e
Change-Id: I76c6a8ebc739daa1aa124fecccf6fcc341e8fd7a
David Gross [Mon, 15 Aug 2016 17:23:18 +0000 (17:23 +0000)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
am:
b50e856fc7
Change-Id: Iad5173dfd05c77284d74bbff2c095d91064a941f
David Gross [Mon, 15 Aug 2016 17:17:01 +0000 (17:17 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Phil Weaver [Fri, 12 Aug 2016 21:05:00 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
Elliott Hughes [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1
am:
2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
Elliott Hughes [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "recvfrom takes a non-const pointer."
am:
96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa