OSDN Git Service
Jean-Michel Trivi [Fri, 9 Sep 2016 18:56:48 +0000 (11:56 -0700)]
Fix Zen mode for different notification usage types
ZenModeHelper was only considering a subset of all notification usage
types. The code was also iterating over the usage values, expecting
them to be contiguous, which will break with the addition of new
usage values.
The update consists in:
- defining in AudioAttributes an array of expected usage types
- defining the suppression behavior for each usage type
- have ZenModeHelper query the behavior for each usage in
order to apply the corresponding muting behavior.
Bug
29009099
Change-Id: If884dda6297f125c60c5775c757df4f782e22e53
Andrew Solovay [Thu, 8 Sep 2016 17:55:51 +0000 (17:55 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev am:
de40f9d677
am:
6cff52dbae
Change-Id: Ida064a9e8fd3498f2df2f5843c94ecd53653124a
Andrew Solovay [Thu, 8 Sep 2016 17:50:36 +0000 (17:50 +0000)]
docs: Fixing links to moved Fragments guide, + redirect am:
f53968061c
am:
37b32a5d31
Change-Id: Iedccf6e09180096235f438edb96bdf73e273fae0
Andrew Solovay [Thu, 8 Sep 2016 17:43:45 +0000 (17:43 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
am:
de40f9d677
Change-Id: Ib6be573fb963eda1d032c55eb9da4878d7374533
Andrew Solovay [Thu, 8 Sep 2016 17:43:40 +0000 (17:43 +0000)]
docs: Fixing links to moved Fragments guide, + redirect
am:
f53968061c
Change-Id: Ic29b29244d2919bcd5eb5b72daeaa8a78dc71e2d
Andrew Solovay [Thu, 8 Sep 2016 17:36:46 +0000 (17:36 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
Marco Nelissen [Thu, 8 Sep 2016 17:34:16 +0000 (17:34 +0000)]
Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 17:25:16 +0000 (17:25 +0000)]
Merge "DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior." into nyc-mr1-dev
xiaoli.xb.zuo [Wed, 13 Jul 2016 05:37:58 +0000 (14:37 +0900)]
Fix memory leak in MediaScannerConnection
This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.
Bug:
30150344
Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf
TreeHugger Robot [Thu, 8 Sep 2016 10:52:17 +0000 (10:52 +0000)]
Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev
Narayan Kamath [Thu, 8 Sep 2016 09:21:44 +0000 (09:21 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1 am:
71e6a6f12a am:
177ee386b9 am:
b126d7c7c5
am:
f04f3892fb
Change-Id: I1bfdbef0c8df640d64cdb77cdccc51d38bb75186
Narayan Kamath [Thu, 8 Sep 2016 09:16:24 +0000 (09:16 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1 am:
71e6a6f12a am:
177ee386b9
am:
b126d7c7c5
Change-Id: Ibd4f7188bf500886e53d4b714e5c7de1ad5b10c0
Narayan Kamath [Thu, 8 Sep 2016 09:06:22 +0000 (09:06 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792 am:
c6ced086d1 am:
4474da7b7c am:
5556367bc1
am:
7f78990260
Change-Id: I6a6be5e38a99806f68bf33a2642a79d39f14d3b3
Narayan Kamath [Thu, 8 Sep 2016 09:06:19 +0000 (09:06 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7 am:
47b88a15f6 am:
7a0c7ab520 am:
45d7b8dd2a
am:
c83ca7267a
Change-Id: I3ec8374998a606b98d61a2e6de72b1be2800a4c8
Narayan Kamath [Thu, 8 Sep 2016 09:05:08 +0000 (09:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1 am:
71e6a6f12a
am:
177ee386b9
Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225
Narayan Kamath [Thu, 8 Sep 2016 08:57:48 +0000 (08:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792 am:
c6ced086d1 am:
4474da7b7c
am:
5556367bc1
Change-Id: I5db1d9538c274cf6d5e9a001ba7d38056f3928eb
Narayan Kamath [Thu, 8 Sep 2016 08:57:46 +0000 (08:57 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7 am:
47b88a15f6 am:
7a0c7ab520
am:
45d7b8dd2a
Change-Id: I66a02ec7bac220d515fc623dbcd0688b72db37fb
Narayan Kamath [Thu, 8 Sep 2016 08:57:35 +0000 (08:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01 am:
49d992fdb0 am:
67c4adb5c1 -s ours am:
bf16d345a6
am:
beade90fe3
Change-Id: I17a42a46943a47015a94f31d9e4298ec2162fa29
Narayan Kamath [Thu, 8 Sep 2016 08:49:59 +0000 (08:49 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01 am:
49d992fdb0 am:
67c4adb5c1 -s ours
am:
bf16d345a6
Change-Id: Iedb9a7c7428cd8a5dc5aabaf9f1f88d96c8f022a
Narayan Kamath [Thu, 8 Sep 2016 08:48:39 +0000 (08:48 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792 am:
c6ced086d1
am:
4474da7b7c
Change-Id: Ie14b0e7887bd2da5c986b077f4563bbc306c88be
Narayan Kamath [Thu, 8 Sep 2016 08:48:31 +0000 (08:48 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7 am:
47b88a15f6
am:
7a0c7ab520
Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6
Narayan Kamath [Thu, 8 Sep 2016 08:45:47 +0000 (08:45 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1
am:
71e6a6f12a
Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a
Narayan Kamath [Thu, 8 Sep 2016 08:44:31 +0000 (08:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01 am:
49d992fdb0
am:
67c4adb5c1 -s ours
Change-Id: I2af50f6d32be035f491df4a0b83489ba7da186e7
Narayan Kamath [Thu, 8 Sep 2016 08:40:03 +0000 (08:40 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32
am:
447d3798f1
Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389
Narayan Kamath [Thu, 8 Sep 2016 08:39:07 +0000 (08:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792
am:
c6ced086d1
Change-Id: Ie3699efd33fe53acfd0dff64cbb18e4792a65bf3
Narayan Kamath [Thu, 8 Sep 2016 08:35:04 +0000 (08:35 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7
am:
47b88a15f6
Change-Id: Id267e22508824d569f54068291304584b3343b9a
Narayan Kamath [Thu, 8 Sep 2016 08:34:58 +0000 (08:34 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01
am:
49d992fdb0
Change-Id: I0560d831235bd7ba3ea764b23e64b4e08110d7e5
Narayan Kamath [Thu, 8 Sep 2016 08:33:40 +0000 (08:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours
am:
6fa8339792
Change-Id: Id7ad55a251a26782815005218dc186b53e74cfca
Narayan Kamath [Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
am:
014016cf32
Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624
Narayan Kamath [Thu, 8 Sep 2016 08:24:54 +0000 (08:24 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
am:
459810b9b7
Change-Id: I867a7c97c8363ede1b04e4ea8a75045d36d9d58d
Narayan Kamath [Thu, 8 Sep 2016 08:24:47 +0000 (08:24 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
41ca1bce01
Change-Id: Id08676457fa3fa022d607e5de754f49b9c396261
Narayan Kamath [Thu, 8 Sep 2016 08:23:49 +0000 (08:23 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
0f6a0e1560 -s ours
Change-Id: I2cdd131b750b4d04672149dcf7a90d2d566dd621
Narayan Kamath [Thu, 8 Sep 2016 08:20:55 +0000 (08:20 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
TreeHugger Robot [Thu, 8 Sep 2016 08:17:48 +0000 (08:17 +0000)]
Merge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev
Narayan Kamath [Thu, 8 Sep 2016 08:12:17 +0000 (08:12 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
Narayan Kamath [Thu, 8 Sep 2016 07:52:59 +0000 (07:52 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am:
15ab539368
am:
d18881d4f8
Change-Id: Id755f9a0a2854f874f852eddeaf129e59bb15838
Narayan Kamath [Thu, 8 Sep 2016 07:52:57 +0000 (07:52 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
a1252ccbdb
am:
abd5b05190 -s ours
Change-Id: I372ab503a353175ff9e7ed49e8c775481f173bd8
Narayan Kamath [Thu, 8 Sep 2016 07:47:24 +0000 (07:47 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
am:
15ab539368
Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212
Narayan Kamath [Thu, 8 Sep 2016 07:41:44 +0000 (07:41 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
a1252ccbdb
Change-Id: Idd41ba2068102de067a66080da0563cf75b1e433
Narayan Kamath [Thu, 8 Sep 2016 07:30:43 +0000 (07:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
Greg Kaiser [Thu, 8 Sep 2016 05:37:25 +0000 (05:37 +0000)]
Merge "ContextHubService: Don't change app handle on load" into nyc-mr1-dev
Ruben Brunk [Thu, 8 Sep 2016 01:15:57 +0000 (01:15 +0000)]
Merge "Disable "Night Light" mode while in VR mode." into nyc-mr1-dev
TreeHugger Robot [Thu, 8 Sep 2016 00:34:19 +0000 (00:34 +0000)]
Merge "Created a NETWORK trace tag." into nyc-mr1-dev
Andrew Solovay [Thu, 8 Sep 2016 00:12:25 +0000 (00:12 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev am:
bdbed7857b
am:
139ded758a
Change-Id: I7bc5c5eada818981f76a7b85a2e00936b4fa22de
Andrew Solovay [Thu, 8 Sep 2016 00:12:23 +0000 (00:12 +0000)]
docs: Added item to Support Library revision history am:
89e77eb55c
am:
e63f82734e
Change-Id: I72f05d38fcc0d0755ebcfcfb39cb1bc33670b65f
Scott Main [Thu, 8 Sep 2016 00:05:12 +0000 (00:05 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev am:
9635756473
am:
16fe510e03
Change-Id: If1309a7eca08359525464c3c2ff344abc63e2330
smain@google.com [Thu, 8 Sep 2016 00:05:07 +0000 (00:05 +0000)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!) am:
14f51a724e
am:
78622206ce
Change-Id: Idf7d1ebb59952c5453356cdd676c25f673bb8b22
Andrew Solovay [Thu, 8 Sep 2016 00:04:52 +0000 (00:04 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev
am:
bdbed7857b
Change-Id: I9f7fe6847bb36d197174869ba6224d3db1581c0e
Andrew Solovay [Thu, 8 Sep 2016 00:04:48 +0000 (00:04 +0000)]
docs: Added item to Support Library revision history
am:
89e77eb55c
Change-Id: Ia649f9e8f28697014153a2f29762426303292aa2
Scott Main [Wed, 7 Sep 2016 23:51:47 +0000 (23:51 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev
am:
9635756473
Change-Id: Ieae6cd0439d75e8858a16b44393fd248ddffcaa3
smain@google.com [Wed, 7 Sep 2016 23:51:44 +0000 (23:51 +0000)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!)
am:
14f51a724e
Change-Id: I1a0d719e4aac12155cf0889069b8efd10084fe67
TreeHugger Robot [Wed, 7 Sep 2016 23:46:31 +0000 (23:46 +0000)]
Merge "Package Manager: Sort list of packages to dexopt" into nyc-mr1-dev
TreeHugger Robot [Wed, 7 Sep 2016 23:45:37 +0000 (23:45 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev
Scott Main [Wed, 7 Sep 2016 23:39:50 +0000 (23:39 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev
Mark Lu [Wed, 7 Sep 2016 23:35:45 +0000 (23:35 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev am:
2b05f12911
am:
4e61df6258
Change-Id: Ieebfbd7e527e7d396398076075741f28df7d3ad3
Mark Lu [Wed, 7 Sep 2016 23:35:43 +0000 (23:35 +0000)]
docs: fix grammar mistake in TextureView am:
e8691d19cb
am:
c657eed270
Change-Id: Ie27e53ef83f31dc528df7db8973e6484d1b53230
Mark Lu [Wed, 7 Sep 2016 23:29:27 +0000 (23:29 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
am:
2b05f12911
Change-Id: Ia4944106365d6c6c85b3cf2dc47250b160a5424b
Mark Lu [Wed, 7 Sep 2016 23:29:20 +0000 (23:29 +0000)]
docs: fix grammar mistake in TextureView
am:
e8691d19cb
Change-Id: I857deef5cf08c9cdaf0d6e8e99449e688bec5ba5
Mark Lu [Wed, 7 Sep 2016 23:24:09 +0000 (23:24 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
TreeHugger Robot [Wed, 7 Sep 2016 22:53:50 +0000 (22:53 +0000)]
Merge "A11y: Prevent utterance from resetting RemoteInputView" into nyc-mr1-dev
Andrew Solovay [Fri, 26 Aug 2016 22:46:38 +0000 (15:46 -0700)]
docs: Fixing links to moved Fragments guide, + redirect
The Fragments API guide was moved, but apparently a redirect was
never set up. Also, there are a few links to the old location in
the Javadocs.
Staged the revised Javadocs (see first comment for stage location).
Not going to stage the redirects file since it would trash another,
bigger CL that deals with the redirects file, but it's pretty
straightforward.
bug:
30559011
Change-Id: Ibd65f85c1ebb9789c1d40614fe11fe4ffda97e58
Robin Lee [Wed, 7 Sep 2016 22:23:12 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am:
fb2cdce7c2
am:
a28de3b8c5
Change-Id: I8af478fbc7eb8c62142769cd0f23a33cb3c821c3
Robin Lee [Wed, 7 Sep 2016 22:23:10 +0000 (22:23 +0000)]
DO NOT MERGE Stop work challenge freeform bypass am:
0737c2b4c2
am:
ec5ceae174
Change-Id: Ic4bbce08944881f0d20a08c1ebb4db5531208f23
Robin Lee [Wed, 7 Sep 2016 22:15:30 +0000 (22:15 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am:
fb2cdce7c2
Change-Id: I50be838e9f0f9e794389f6d24a5e699d7f163caf
Robin Lee [Wed, 7 Sep 2016 22:15:28 +0000 (22:15 +0000)]
DO NOT MERGE Stop work challenge freeform bypass
am:
0737c2b4c2
Change-Id: Ia76391f710e42e9634010bd211a0370230b318e3
TreeHugger Robot [Wed, 7 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
Andreas Gampe [Wed, 7 Sep 2016 01:22:19 +0000 (18:22 -0700)]
Package Manager: Sort list of packages to dexopt
Sort the list by last-use-time, if available. Interleave the
dependencies with the packages.
Clean up the code a bit for better code reuse and ease of writing
filters.
This should help with prioritization under space constraints.
Bug:
31347757
Change-Id: Ia0ec62faf013a379dc4c80b18fd6b2bfbfa470c4
Andrew Solovay [Mon, 29 Aug 2016 19:05:17 +0000 (12:05 -0700)]
docs: Added item to Support Library revision history
See first comment for doc stage location.
bug:
30622244
Change-Id: I7cfdf2107d57d72565bcc4cc503242741f2452ff
TreeHugger Robot [Wed, 7 Sep 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Moved activity to stopped state if relaunched while device is asleep" into nyc-mr1-dev
Makoto Onuki [Wed, 7 Sep 2016 21:36:35 +0000 (21:36 +0000)]
Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev
Adrian Roos [Wed, 7 Sep 2016 21:08:40 +0000 (14:08 -0700)]
A11y: Prevent utterance from resetting RemoteInputView
Fixes a bug where the RemoteInputView would issue an
utterance upon resetting the view because it was not
hidden at that point.
Change-Id: I3f80b903c0b3e55c308bda8d4f18aa0b586aa328
Fixes:
30103313
TreeHugger Robot [Wed, 7 Sep 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Fix slow PIN dismiss animation" into nyc-mr1-dev
smain@google.com [Tue, 6 Sep 2016 19:32:18 +0000 (12:32 -0700)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!)
stage: https://android-dot-devsite.googleplex.com/training/basics/firstapp/creating-project.html
Change-Id: I40ce201553226fa36477e54b82721bc6cc85b88b
Alan Viverette [Wed, 7 Sep 2016 21:03:45 +0000 (21:03 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev am:
9d25bf73a4
am:
75136ac15b
Change-Id: I83b88e8b9c2b5f807f06b016110a19d46dbb348c
Alan Viverette [Wed, 7 Sep 2016 21:03:43 +0000 (21:03 +0000)]
Support library 24.2.0 API diff am:
ae3fecc1a9
am:
56477c1fcb
Change-Id: I3e4f453f37fabe0e5358b32272d38d93ea97b28c
Alan Viverette [Wed, 7 Sep 2016 20:59:53 +0000 (20:59 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
am:
9d25bf73a4
Change-Id: I0f691281d86562c96ed0768efb69d6df77d29456
Alan Viverette [Wed, 7 Sep 2016 20:59:49 +0000 (20:59 +0000)]
Support library 24.2.0 API diff
am:
ae3fecc1a9
Change-Id: Ie9a007ad44ae0293ef4c4138888da0e78d61b322
Alan Viverette [Wed, 7 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
Felipe Leme [Wed, 7 Sep 2016 18:34:10 +0000 (11:34 -0700)]
Created a NETWORK trace tag.
Also applied it to a few critical paths on NetworkPolicyManagerService.
BUG:
31281543
Change-Id: If27240d86c21e5b49b9595bfcbc90214126cf489
Narayan Kamath [Wed, 7 Sep 2016 20:43:30 +0000 (20:43 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9 am:
f52b30cf8d
am:
a2112ae2a0
Change-Id: I0a25aa4285f9661a5bc53114c90aaca054ea6df1
Andrew Solovay [Wed, 7 Sep 2016 20:37:16 +0000 (20:37 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev am:
33831c02b5
am:
733e368097
Change-Id: Ice97fbcfcd0fa8b412bfc2abe8b526bc4de86800
Andrew Solovay [Wed, 7 Sep 2016 20:37:14 +0000 (20:37 +0000)]
docs: Fixing redirect file am:
5bf2ea6670
am:
7771476630
Change-Id: I591778d29944c5c74c9953ae24d4ba31a45ae8b7
Narayan Kamath [Wed, 7 Sep 2016 20:36:47 +0000 (20:36 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9
am:
f52b30cf8d
Change-Id: I99751b55fb10e0fcd2703d59d8925744a73bcfd0
Narayan Kamath [Wed, 7 Sep 2016 20:32:17 +0000 (20:32 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210
am:
ebcc7aeda9
Change-Id: Ie2e2292bbb8c6d274109d64f7dd3ed00fca0ba0f
Steve McKay [Fri, 2 Sep 2016 23:38:41 +0000 (16:38 -0700)]
DO NOT MERGE: Accurately emulate historic Downloads ACTION_VIEW behavior.
Add write permision to VIEW intent (don't regress bahavior).
Add (already known) mimetype when creating intent.
Test: Download a CSV file to Downloads *root*.
Install Sheets from play store.
Navigate to Settings > Storage > Explore > (device name) > Download
Tap CSV file.
It should open.
NOTE: This is a (manual) cherrypick from master. Manual part necessary
as DocumentsUI has moved to a new repo in master.
https://googleplex-android.googlesource.com/platform/frameworks/base/+/
a4e765f16e3c0031343af55df65380df44672825
Bug:
31245151
Change-Id: Ic64c655d33182e559f9645c1e173b2fe4b601d6c
Andrew Solovay [Wed, 7 Sep 2016 20:25:45 +0000 (20:25 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
am:
33831c02b5
Change-Id: I22a2c26b77c0ce27499ee1a9ba3567e6c337cf02
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am:
5bf2ea6670
Change-Id: I8d1ea69862b543eb13c96398d967979e2040914a
Narayan Kamath [Wed, 7 Sep 2016 20:23:28 +0000 (20:23 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934
am:
5febcdd210
Change-Id: Ib7e40acc4682e4198dcaab78c57de02acfe89c94
TreeHugger Robot [Wed, 7 Sep 2016 20:19:07 +0000 (20:19 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 20:17:02 +0000 (20:17 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c
am:
36b90a1934
Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6
Wale Ogunwale [Tue, 6 Sep 2016 17:37:56 +0000 (10:37 -0700)]
Moved activity to stopped state if relaunched while device is asleep
- If an activity is done relaunching and the device is sleeping or
shutting down, go ahead and force the activity to sleep which will
transition it into the stopped state. We do this after the activity
is relaunched as activities can currently only relaunch into the
resumed or paused state both of which are visible state.
However, the activity should be in the stopped state while the device
is sleeping.
- Also removed previous fix for b/
28518380 that prevents activities from
relaunching due to configuration changes while the device is sleeping.
We need to allow relaunches due to configuration changes while the device
is sleeping so the things are responsive when you wake-up the device.
And, it is no longer a big deal since we are transitioning the activity
to the stop state when the relaunch is complete.
Bug:
30253333
Bug:
28518380
Change-Id: I5313c13a13c2d2f9bb43831797918d9e67a30cda
Narayan Kamath [Wed, 7 Sep 2016 20:12:43 +0000 (20:12 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b
am:
2acf9f7e3c
Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b
Narayan Kamath [Wed, 7 Sep 2016 20:07:58 +0000 (20:07 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours
am:
9802fcfa2b
Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87
am:
9a409265fc -s ours
Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
(cherry picked from commit
c5f27a7cb2ec816f483a65255034a1b57a8aa221)
Fix clang build breakage (-Werror -Wformat).
Use %zd for size_t. Note that this will break only on (-plus-)aosp because
clang is disabled on the N development branches.
bug:
30963384
(cherry picked from commit
b334c33d65894f5ca9833fa55c3a1cf75e01c497)
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
(cherry picked from commit
3764a260f0c90dcb323caeda14baf903cc108759)
fd_utils: Remove whitelist for "/dev/pmsg0".
We're now calling __android_log_close prior to a fork, so this file
shouldn't need to be open.
bug:
31243313
bug:
30963384
(cherry picked from commit
8dee0541904e4f792cdebdee4f23f768561cb276)
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
(cherry picked from commit
0b76d6a28e6978151bf245a775329cdae5e574d5)
add dri device to zygote whitelisted FDs
The driver can be used just like /dev/ion for graphic buffers.
(cherry picked from commit
8977e424ee2d6d85fec419532ae510131aa88c45)
TreeHugger Robot [Wed, 7 Sep 2016 19:19:55 +0000 (19:19 +0000)]
Merge "SurfaceView: Correct coordinate space in windowPositionLostRT." into nyc-mr1-dev
Andrew Solovay [Wed, 7 Sep 2016 19:12:38 +0000 (19:12 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev am:
4dc743ac67
am:
d4c903e233
Change-Id: I89dd3b93a80e13f8b196bfc9a111d29299540759
Andrew Solovay [Wed, 7 Sep 2016 19:12:33 +0000 (19:12 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI am:
7cfe9f83ac
am:
f2752e8f51
Change-Id: I397d056fe1d73898d28d89770dbcd95095f344b4
Andrew Solovay [Wed, 7 Sep 2016 19:07:52 +0000 (19:07 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
am:
4dc743ac67
Change-Id: Id0057e57b226cddb1411aa9c864143d704565013
Andrew Solovay [Wed, 7 Sep 2016 19:07:47 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am:
7cfe9f83ac
Change-Id: Ia16702066a3760311eac69e4b2a8923380e77fde