Scott Main
bf5f1674c7
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev
2016-09-12 21:42:29 +00:00
Scott Main
b42e41e9c8
Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev
2016-09-12 21:41:26 +00:00
Wyatt Riley
a8037fffd3
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)
2016-09-12 20:13:55 +00:00
Eino-Ville Talvala
e93c655093
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
2016-09-12 19:20:06 +00:00
smain@google.com
3d5a4c9eda
add link for how to update the gradle plugin.
...
bug: 23725775
Change-Id: I5338cec2fed09b4b91e063d989b311d027b169ed
2016-09-12 12:07:26 -07:00
Andrew Solovay
2f4c688710
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
2016-09-12 18:45:08 +00:00
Sungsoo
054d2931a0
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
2016-09-10 00:30:22 +00:00
Sungsoo
d98163c7a6
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
2016-09-10 00:22:56 +00:00
Sungsoo
89e328770d
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
2016-09-10 00:11:48 +00:00
Sungsoo
8ec076623b
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
2016-09-10 00:03:23 +00:00
Sungsoo
0a7a489ce8
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
2016-09-10 00:02:18 +00:00
Sungsoo
ebeb3a9d3c
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
2016-09-09 23:50:55 +00:00
Sungsoo
deeb0e5246
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
2016-09-09 23:50:46 +00:00
Sungsoo
0c476fac30
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
2016-09-09 23:50:39 +00:00
Sungsoo
2ddc2956fd
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
2016-09-09 23:46:07 +00:00
Sungsoo
e5d9dc7eac
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
2016-09-09 23:44:57 +00:00
Sungsoo
e38a89dfb8
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
2016-09-09 23:44:44 +00:00
Sungsoo
2418ef1313
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
2016-09-09 23:39:52 +00:00
Sungsoo Lim
034401cfaf
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
2016-09-09 23:38:54 +00:00
Sungsoo
85446272d3
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813 am: 45e14ffec6
...
am: 5906630ad7 -s ours
Change-Id: If39f3ad11006c270690a6621dfa0c16d7b74e68c
2016-09-09 23:38:34 +00:00
Sungsoo
40d3c1a7f0
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
2016-09-09 23:37:52 +00:00
Sungsoo
bf62cbb95e
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
2016-09-09 23:37:47 +00:00
Sungsoo
14bc23be74
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
2016-09-09 23:27:21 +00:00
Andrew Solovay
88082e9ff8
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
2016-09-09 16:22:02 -07:00
Sungsoo
ca88e604e4
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: aebe2347a7 -s ours am: 3af57850a0
...
am: c17e29076e
Change-Id: If6e85c284a811287a9751eb501e50dabe2dfe8b1
2016-09-09 23:08:29 +00:00
Sungsoo
9f37a8900e
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
2016-09-09 23:08:29 +00:00
Sungsoo
e9a7225bf2
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 659275dc30 am: 8d3e6bd3ef am: dde94fc477 -s ours
...
am: aa1d75f5e7
Change-Id: Ib06cad762d46ba7577a87ef19c9cfe8f83f7ba0c
2016-09-09 23:08:25 +00:00
Sungsoo Lim
ba9aa89cfe
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab
...
am: 883a724193
Change-Id: I3766dbd982ea51e8f7429da76bce8b9feebbfe8d
2016-09-09 23:07:52 +00:00
Sungsoo
5906630ad7
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc am: 865bf88813
...
am: 45e14ffec6
Change-Id: I1a6d79242b6f972dca5bb7eb6ddd37960b1cd4f9
2016-09-09 23:07:49 +00:00
Sungsoo
aa1d75f5e7
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 659275dc30 am: 8d3e6bd3ef
...
am: dde94fc477 -s ours
Change-Id: I301706cbdc5fd2ca56eb671891e55fd31dfa469a
2016-09-09 23:01:41 +00:00
Sungsoo
f495cf6944
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830
...
am: d07324fe85 -s ours
Change-Id: Ie3049cea7663d06632b0e3139f30f01e7dba5df0
2016-09-09 23:00:35 +00:00
Sungsoo
c17e29076e
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: aebe2347a7 -s ours
...
am: 3af57850a0
Change-Id: I70f6b639cab68d401d3927c67192d3b89e08eee3
2016-09-09 23:00:21 +00:00
Sungsoo Lim
883a724193
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c
...
am: bcc0e5a7ab
Change-Id: I03932a82253351dd46dee8bdd7e8910bd5862410
2016-09-09 22:55:14 +00:00
Sungsoo
45e14ffec6
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 2ee53c82cc
...
am: 865bf88813
Change-Id: I1a59ad0872c98a416efa7bfc8800d65c01cea3f8
2016-09-09 22:55:11 +00:00
Sungsoo
3af57850a0
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
am: aebe2347a7 -s ours
Change-Id: I58dd093cb10fd89e44d59867f5a4c1a378a61661
2016-09-09 22:54:32 +00:00
Sungsoo
dde94fc477
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 659275dc30
...
am: 8d3e6bd3ef
Change-Id: I83f7733039ee73407aa5d7f3848ad1074e9dfb03
2016-09-09 22:54:28 +00:00
Sungsoo
d07324fe85
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953
...
am: b336cce830
Change-Id: Ib90b72ce9abefc6a7ceab1070555ded45dc8567d
2016-09-09 22:54:12 +00:00
Sungsoo Lim
bcc0e5a7ab
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
...
am: 987472290c
Change-Id: Ida680d7915f1774e1f4b2cf94d38c384d50c0e64
2016-09-09 22:47:09 +00:00
Sungsoo
865bf88813
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
am: 2ee53c82cc
Change-Id: Ifb5d9af5faae122dcd3111a83e69a218bf4e4f3f
2016-09-09 22:47:06 +00:00
Sungsoo
8d3e6bd3ef
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
am: 659275dc30
Change-Id: I385c86e9753f1c99201a4f32b3c8b840da51376e
2016-09-09 22:46:44 +00:00
Sungsoo
b336cce830
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
...
am: 1bdd10a953
Change-Id: I644f8187ed6f5957fc273b98c10ed0c602ed1879
2016-09-09 22:46:23 +00:00
Sungsoo Lim
c60f995ae9
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
2016-09-09 22:39:22 +00:00
Sungsoo Lim
987472290c
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev
2016-09-09 22:39:08 +00:00
Eino-Ville Talvala
e175aa82b5
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
2016-09-09 15:11:56 -07:00
TreeHugger Robot
148ccbb082
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
2016-09-09 18:34:59 +00:00
Narayan Kamath
19ebec6d36
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
2016-09-09 10:44:54 +00:00
Narayan Kamath
7aba7234e1
Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c
...
am: eb972e5d9d
Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
2016-09-09 10:39:40 +00:00
Narayan Kamath
e9295560cf
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
2016-09-09 10:39:29 +00:00
Narayan Kamath
eb972e5d9d
Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e -s ours am: 646ee94421 am: 8f0cc3dd13
...
am: 8cb6b9335c
Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
2016-09-09 10:33:43 +00:00
Narayan Kamath
bd6a29cddc
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e
...
am: 24ffc9ab47
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
2016-09-09 10:33:40 +00:00