OSDN Git Service
TreeHugger Robot [Tue, 13 Sep 2016 05:52:19 +0000 (05:52 +0000)]
Merge "docs: September 2016 Dashboard update" into nyc-dev
Kevin Hufnagle [Tue, 13 Sep 2016 05:49:28 +0000 (05:49 +0000)]
Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev
Joe Fernandez [Tue, 13 Sep 2016 04:32:47 +0000 (21:32 -0700)]
docs: September 2016 Dashboard update
Change-Id: I55b5e4d64ec6ff3275a616169fe159b2dfd6c91f
Scott Main [Mon, 12 Sep 2016 21:42:27 +0000 (21:42 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568" into nyc-dev
Scott Main [Mon, 12 Sep 2016 21:41:23 +0000 (21:41 +0000)]
Merge "add link for how to update the gradle plugin. bug:
23725775" into nyc-dev
Wyatt Riley [Thu, 4 Aug 2016 23:10:06 +0000 (16:10 -0700)]
LocationManager - Handle Shutdown for right User
Only process a shutdown when it is for all users (whole system),
not a single user
Change-Id: Id51b7fb4606460462c2f6749e5ac3984bdd8319f
Bug:
30646142
(cherry picked from commit
1b24fb17b8613894d6066dcf408e60caf2a56192)
Eino-Ville Talvala [Mon, 12 Sep 2016 19:20:02 +0000 (19:20 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
smain@google.com [Mon, 12 Sep 2016 19:07:26 +0000 (12:07 -0700)]
add link for how to update the gradle plugin.
bug:
23725775
Change-Id: I5338cec2fed09b4b91e063d989b311d027b169ed
Andrew Solovay [Mon, 12 Sep 2016 18:45:05 +0000 (18:45 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
Sungsoo [Sat, 10 Sep 2016 00:30:22 +0000 (00:30 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b am:
89e328770d
am:
d98163c7a6 -s ours
Change-Id: Iaa9d3a28872d990cb5196086f9deaaa1d03336cc
Sungsoo [Sat, 10 Sep 2016 00:22:56 +0000 (00:22 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246 am:
8ec076623b
am:
89e328770d
Change-Id: I400b511b84f599ea05fb33a5db5dbc8da2c031b0
Sungsoo [Sat, 10 Sep 2016 00:11:48 +0000 (00:11 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours am:
deeb0e5246
am:
8ec076623b
Change-Id: Iee2ca5301d261552694bf7dfcc324730e0b967f4
Sungsoo [Sat, 10 Sep 2016 00:03:23 +0000 (00:03 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0 am:
2ddc2956fd -s ours
am:
deeb0e5246
Change-Id: Ica5ffed73e58ea429c88e52551e69ac39938c46c
Sungsoo [Sat, 10 Sep 2016 00:02:18 +0000 (00:02 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313 am:
e5d9dc7eac
am:
0c476fac30 -s ours
Change-Id: Ibe1f7b4ad4dbdfdbad56f806928e4aec1d6ffe79
Sungsoo [Fri, 9 Sep 2016 23:50:55 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2 am:
bf62cbb95e
am:
e38a89dfb8 -s ours
Change-Id: I05536b488f67ccee7ceeb2bcde5f3bb50985e3e1
Sungsoo [Fri, 9 Sep 2016 23:50:46 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e am:
40d3c1a7f0
am:
2ddc2956fd -s ours
Change-Id: Ie0a7dad2ed06124a537077f8fb85c95bc1d49781
Sungsoo [Fri, 9 Sep 2016 23:50:39 +0000 (23:50 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74 am:
2418ef1313
am:
e5d9dc7eac
Change-Id: Ibf5e67c94ab6442b3e7d3e069d021fa83d424771
Sungsoo [Fri, 9 Sep 2016 23:46:07 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours am:
9f37a8900e
am:
40d3c1a7f0
Change-Id: I491d585b91c7d7b130bbfbcdd62aaddf57718c56
Sungsoo [Fri, 9 Sep 2016 23:44:57 +0000 (23:44 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours am:
14bc23be74
am:
2418ef1313
Change-Id: I21056ca0c2858c4414fe3c11d70d96b9fb9a8c57
Sungsoo [Fri, 9 Sep 2016 23:44:44 +0000 (23:44 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7 am:
e9a7225bf2
am:
bf62cbb95e
Change-Id: I37df2e1008676f6a8e0c4364203ce234361bb2f0
Sungsoo [Fri, 9 Sep 2016 23:39:52 +0000 (23:39 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e am:
ca88e604e4 -s ours
am:
14bc23be74
Change-Id: I697d8519269bcf82d47a00b9ed236bd285268261
Sungsoo Lim [Fri, 9 Sep 2016 23:38:54 +0000 (23:38 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab am:
883a724193
am:
ba9aa89cfe -s ours
Change-Id: Ic85cbc0ad279e0c8e8859b066ec98638cfbd1cec
Sungsoo [Fri, 9 Sep 2016 23:38:34 +0000 (23:38 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813 am:
45e14ffec6
am:
5906630ad7 -s ours
Change-Id: If39f3ad11006c270690a6621dfa0c16d7b74e68c
Sungsoo [Fri, 9 Sep 2016 23:37:52 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours am:
f495cf6944 -s ours
am:
9f37a8900e
Change-Id: Ied9ac7711abaee4d1f534d35f7882f0a93c425bf
Sungsoo [Fri, 9 Sep 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours am:
aa1d75f5e7
am:
e9a7225bf2
Change-Id: Ie7fa7ee8d7f4acee388ec76ae1f687c6235c955b
Sungsoo [Fri, 9 Sep 2016 23:27:21 +0000 (23:27 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0 am:
c17e29076e
am:
ca88e604e4 -s ours
Change-Id: Iae1ea19a96fbf9421a24b5682c4b769af95b2660
Andrew Solovay [Fri, 9 Sep 2016 21:55:40 +0000 (14:55 -0700)]
docs: Updated for Support Library 24.2.1
Added new (bugfix-only) Support Library 24.2.1. Updated "features"
page so Gradle include lines use that version.
See first comment for doc stage location.
bug:
31338993
Change-Id: Ifaeecbc47c6aeff79d6e328e19e4e8775ce51e6c
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours am:
3af57850a0
am:
c17e29076e
Change-Id: If6e85c284a811287a9751eb501e50dabe2dfe8b1
Sungsoo [Fri, 9 Sep 2016 23:08:29 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830 am:
d07324fe85 -s ours
am:
f495cf6944 -s ours
Change-Id: If47c5a777ad3c7e4cca070ca633ec01442444c8e
Sungsoo [Fri, 9 Sep 2016 23:08:25 +0000 (23:08 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef am:
dde94fc477 -s ours
am:
aa1d75f5e7
Change-Id: Ib06cad762d46ba7577a87ef19c9cfe8f83f7ba0c
Sungsoo Lim [Fri, 9 Sep 2016 23:07:52 +0000 (23:07 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c am:
bcc0e5a7ab
am:
883a724193
Change-Id: I3766dbd982ea51e8f7429da76bce8b9feebbfe8d
Sungsoo [Fri, 9 Sep 2016 23:07:49 +0000 (23:07 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813
am:
45e14ffec6
Change-Id: I1a6d79242b6f972dca5bb7eb6ddd37960b1cd4f9
Sungsoo [Fri, 9 Sep 2016 23:01:41 +0000 (23:01 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30 am:
8d3e6bd3ef
am:
dde94fc477 -s ours
Change-Id: I301706cbdc5fd2ca56eb671891e55fd31dfa469a
Sungsoo [Fri, 9 Sep 2016 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953 am:
b336cce830
am:
d07324fe85 -s ours
Change-Id: Ie3049cea7663d06632b0e3139f30f01e7dba5df0
Sungsoo [Fri, 9 Sep 2016 23:00:21 +0000 (23:00 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
aebe2347a7 -s ours
am:
3af57850a0
Change-Id: I70f6b639cab68d401d3927c67192d3b89e08eee3
Sungsoo Lim [Fri, 9 Sep 2016 22:55:14 +0000 (22:55 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am:
987472290c
am:
bcc0e5a7ab
Change-Id: I03932a82253351dd46dee8bdd7e8910bd5862410
Sungsoo [Fri, 9 Sep 2016 22:55:11 +0000 (22:55 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc
am:
865bf88813
Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
Sungsoo [Fri, 9 Sep 2016 22:54:32 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
aebe2347a7 -s ours
Change-Id: I58dd093cb10fd89e44d59867f5a4c1a378a61661
Sungsoo [Fri, 9 Sep 2016 22:54:28 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
659275dc30
am:
8d3e6bd3ef
Change-Id: I83f7733039ee73407aa5d7f3848ad1074e9dfb03
Sungsoo [Fri, 9 Sep 2016 22:54:12 +0000 (22:54 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
1bdd10a953
am:
b336cce830
Change-Id: Ib90b72ce9abefc6a7ceab1070555ded45dc8567d
Sungsoo Lim [Fri, 9 Sep 2016 22:47:09 +0000 (22:47 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
am:
987472290c
Change-Id: Ida680d7915f1774e1f4b2cf94d38c384d50c0e64
Sungsoo [Fri, 9 Sep 2016 22:47:06 +0000 (22:47 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
2ee53c82cc
Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
Sungsoo [Fri, 9 Sep 2016 22:46:44 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
659275dc30
Change-Id: I385c86e9753f1c99201a4f32b3c8b840da51376e
Sungsoo [Fri, 9 Sep 2016 22:46:23 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
1bdd10a953
Change-Id: I644f8187ed6f5957fc273b98c10ed0c602ed1879
Sungsoo Lim [Fri, 9 Sep 2016 22:39:20 +0000 (22:39 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
Sungsoo Lim [Fri, 9 Sep 2016 22:39:06 +0000 (22:39 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
Eino-Ville Talvala [Fri, 22 Jul 2016 00:04:19 +0000 (17:04 -0700)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocation time if more buffers are needed later.
It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.
Bug:
28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9
TreeHugger Robot [Fri, 9 Sep 2016 18:34:55 +0000 (18:34 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
Narayan Kamath [Fri, 9 Sep 2016 10:44:54 +0000 (10:44 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc
am:
e9295560cf
Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5
Narayan Kamath [Fri, 9 Sep 2016 10:39:40 +0000 (10:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c
am:
eb972e5d9d
Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
Narayan Kamath [Fri, 9 Sep 2016 10:39:29 +0000 (10:39 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47
am:
bd6a29cddc
Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1
Narayan Kamath [Fri, 9 Sep 2016 10:33:43 +0000 (10:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13
am:
8cb6b9335c
Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
Narayan Kamath [Fri, 9 Sep 2016 10:33:40 +0000 (10:33 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e
am:
24ffc9ab47
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
Narayan Kamath [Fri, 9 Sep 2016 10:28:52 +0000 (10:28 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b
am:
e59073096e
Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
Narayan Kamath [Fri, 9 Sep 2016 10:28:46 +0000 (10:28 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421
am:
8f0cc3dd13
Change-Id: Ida08d48da51f9f49dc70a916fa379cf89a4d33c0
Narayan Kamath [Fri, 9 Sep 2016 10:21:48 +0000 (10:21 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours
am:
646ee94421
Change-Id: I62f6556e630707274daa4ee0a4a57c77f5329bbc
Narayan Kamath [Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am:
00e808b06b
Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
Narayan Kamath [Fri, 9 Sep 2016 10:15:11 +0000 (10:15 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
82c6e6267e -s ours
Change-Id: Ib35b2567f19aff39d285794951cf9b8cb8d74ef1
Narayan Kamath [Fri, 9 Sep 2016 10:05:44 +0000 (10:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
Cheryl Potter [Fri, 9 Sep 2016 01:15:52 +0000 (01:15 +0000)]
Merge "docs: Define card data for GPU Debugger b/
31318053" into nyc-dev
smain@google.com [Thu, 8 Sep 2016 22:49:03 +0000 (15:49 -0700)]
update Cloud Test Lab guide for Firebase / Studio 2.2.
Originally written by Aaron Carey.
bug:
30400568
Change-Id: I49132b33b388f1aeca0d286fc589940a4a6e3098
Vladislav Kaznacheev [Thu, 8 Sep 2016 23:37:23 +0000 (16:37 -0700)]
Update JavaDoc for DragEvent.getLocalState
Explicitly state that "local state" is local to the window
which has started the drag operation.
Bug:
31372686
Change-Id: Idbea7586c4e74097362067fa90390b97744181bb
Kevin Hufnagle [Mon, 13 Jun 2016 22:22:52 +0000 (15:22 -0700)]
docs: Added note about permission/feature changes with network/GPS.
As of API level 21, the ACCESS_COARSE_LOCATION permission no longer
implies the android.hardware.location.network feature, and the
ACCESS_FINE_LOCATION permission no longer implies the
android.hardware.location.gps feature. Updated several docs
accordingly.
Bug:
28052540
Change-Id: Ia86dfd390f85c7a99b50af862d5096f0ac64a133
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
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: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
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
Sungsoo [Tue, 23 Aug 2016 05:48:43 +0000 (14:48 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I115a42601c774062485974042464abb0d65c35e9
(cherry picked from commit
a8f9a075b14c526a0de75c2ade81ebc4e05e4ef8)
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
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
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
Sungsoo [Thu, 8 Sep 2016 07:04:44 +0000 (16:04 +0900)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.
Bug:
30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
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:24:09 +0000 (23:24 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-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
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
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
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 20:54:04 +0000 (20:54 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
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
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
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 :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
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
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
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
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
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
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
(cherry picked from commit
7ec85f9d549971af59f047d5eafd7a829e1541c7)
Change-Id: If44dc64275d753553233b78a05d41df9d5bfdc36
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
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