OSDN Git Service
Scott Main [Mon, 12 Sep 2016 21:55:15 +0000 (21:55 +0000)]
Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568" into nyc-dev
am:
bf5f1674c7
Change-Id: I4aba2ed155272183204a53f13f6d8a548819fe38
smain@google.com [Mon, 12 Sep 2016 21:55:02 +0000 (21:55 +0000)]
update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug:
30400568
am:
b433d73843
Change-Id: I293f8176bc5992494d64113fcf26bd4ed24c37f9
Scott Main [Mon, 12 Sep 2016 21:49:59 +0000 (21:49 +0000)]
Merge "add link for how to update the gradle plugin. bug:
23725775" into nyc-dev
am:
b42e41e9c8
Change-Id: I85f0c0e2adeeb0b057a419d773ab6b8d34d170f5
smain@google.com [Mon, 12 Sep 2016 21:49:49 +0000 (21:49 +0000)]
add link for how to update the gradle plugin. bug:
23725775
am:
3d5a4c9eda
Change-Id: I830356c88dde5667f892bbfca2d7642a30575b6d
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
Felipe Leme [Mon, 12 Sep 2016 21:18:13 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am:
1bb0616c56 -s ours
am:
04829c4ddd -s ours
Change-Id: I87396b8ffe7937ad2264c569246f87a9a819e4f9
Felipe Leme [Mon, 12 Sep 2016 21:14:10 +0000 (21:14 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
am:
1bb0616c56 -s ours
Change-Id: I281ad8d15f59927185e6beaf209c609f2282ef61
Treehugger Robot [Mon, 12 Sep 2016 21:07:39 +0000 (21:07 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
Mitchell Wills [Mon, 12 Sep 2016 21:04:49 +0000 (21:04 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am:
c7b84e6d0d
am:
d8a5904abe
Change-Id: I92f3dc3aa1f3f110426965ec232e2a8b0b5f068b
Robert Sesek [Mon, 12 Sep 2016 21:04:43 +0000 (21:04 +0000)]
Merge changes I104e6133,I54f04c03 am:
191ddb0c27
am:
80c75db311
Change-Id: Ic8a6c7776418240154ec350dd1f72638b4129c18
Robert Sesek [Mon, 12 Sep 2016 21:03:03 +0000 (21:03 +0000)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class. am:
96b49848e7 -s ours
am:
b25389bda0
Change-Id: I761f8ba65fa94be276da16435286313e96d583df
Tobias Sargeant [Mon, 12 Sep 2016 21:02:02 +0000 (21:02 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote. am:
b9679dc1fa -s ours
am:
e38df31d10
Change-Id: I4ac69d33f4a46294bc1437fb574f30412033ed01
Mitchell Wills [Mon, 12 Sep 2016 20:54:46 +0000 (20:54 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
am:
c7b84e6d0d
Change-Id: I8c874c282db93dbb531c9c7e27540044c446144e
Robert Sesek [Mon, 12 Sep 2016 20:54:42 +0000 (20:54 +0000)]
Merge changes I104e6133,I54f04c03
am:
191ddb0c27
Change-Id: I7376f7594314c26926c3b41ffbe4202b865f9091
Robert Sesek [Mon, 12 Sep 2016 20:54:39 +0000 (20:54 +0000)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
am:
96b49848e7 -s ours
Change-Id: I2796758fa0a083ade4b4186eae7210c841c719ed
Tobias Sargeant [Mon, 12 Sep 2016 20:52:36 +0000 (20:52 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
am:
b9679dc1fa -s ours
Change-Id: I6071cb6e8ed2f85351c9fc23f88beed0c6b1fdc9
Mitchell Wills [Mon, 12 Sep 2016 20:38:20 +0000 (20:38 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
Wyatt Riley [Mon, 12 Sep 2016 20:33:16 +0000 (20:33 +0000)]
LocationManager - Handle Shutdown for right User
am:
a8037fffd3
Change-Id: I0fa5f32154e040c16f3fcff1d7454443c93f6691
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)
Treehugger Robot [Mon, 12 Sep 2016 19:42:01 +0000 (19:42 +0000)]
Merge changes I104e6133,I54f04c03
* changes:
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
Refactor ZygoteInit to support a WebView-specific zygote.
Eino-Ville Talvala [Mon, 12 Sep 2016 19:26:40 +0000 (19:26 +0000)]
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am:
e93c655093 -s ours
Change-Id: I9652b84387a9edaf628c00bae3efa4020292d6f2
Eino-Ville Talvala [Mon, 12 Sep 2016 19:24:56 +0000 (19:24 +0000)]
DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
am:
e175aa82b5 -s ours
Change-Id: I6fdae71d780f5214d19474bfaa6d5544419e5ef4
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:54:20 +0000 (18:54 +0000)]
Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
am:
2f4c688710
Change-Id: Ib270874dfcc55c21d41a5dc393f42130f1fea609
Andrew Solovay [Mon, 12 Sep 2016 18:54:14 +0000 (18:54 +0000)]
docs: Updated for Support Library 24.2.1
am:
88082e9ff8
Change-Id: I835121af05716f91663e74c4a5f4b78da670ee40
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
Mitchell Wills [Tue, 6 Sep 2016 22:08:36 +0000 (15:08 -0700)]
Add a flag to indicate if a ScanData is for a scan for all channels
BUG=
30897947
Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
(cherry picked from commit
4bfb391c91b3539d2ec20ffd7e01056dafa0984d)
Elliott Hughes [Mon, 12 Sep 2016 17:07:44 +0000 (17:07 +0000)]
Merge "Move frameworks/base to std::unique_ptr." am:
a4739b86b5
am:
96b3bc7aff
Change-Id: Iac739b0a727558893696b8d8454d63dfb39c548a
Elliott Hughes [Mon, 12 Sep 2016 17:00:09 +0000 (17:00 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
am:
a4739b86b5
Change-Id: Ib07b6585faf4a8b3cc1c2f3e46f1ee27b4865db2
Elliott Hughes [Mon, 12 Sep 2016 16:50:17 +0000 (16:50 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
Elliott Hughes [Sun, 11 Sep 2016 21:50:12 +0000 (14:50 -0700)]
Move frameworks/base to std::unique_ptr.
Bug: http://b/
22403888
Change-Id: Iae2c68b00be7cd9dd215a75cf80b16d7403f6328
Chih-hung Hsieh [Sat, 10 Sep 2016 17:20:37 +0000 (17:20 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils." am:
5e91082b3c
am:
d1dd5ae76b
Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
Chih-hung Hsieh [Sat, 10 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
am:
5e91082b3c
Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
Chih-hung Hsieh [Sat, 10 Sep 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
Sungsoo [Sat, 10 Sep 2016 00:55:19 +0000 (00:55 +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
am:
054d2931a0
Change-Id: I42e7db05b2990a5e5818bbee31a96ad346360fa7
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:12:33 +0000 (00:12 +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
am:
0a7a489ce8
Change-Id: I9967a4b21e65463d66b1c80a2e6b649f99b7410c
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:30 +0000 (00:03 +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
am:
ebeb3a9d3c
Change-Id: Ie23f344b1e9987641e12db6864146dc75b3211e5
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 Lim [Fri, 9 Sep 2016 23:46:12 +0000 (23:46 +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
am:
034401cfaf
Change-Id: Ie955306192481a37d2e59e052fd06fc40cde460b
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:46:06 +0000 (23:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am:
2ee53c82cc am:
865bf88813 am:
45e14ffec6 am:
5906630ad7 -s ours
am:
85446272d3
Change-Id: I44fbba6869f84de456cd9ab512fcd4901993e3af
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 Lim [Fri, 9 Sep 2016 22:47:00 +0000 (22:47 +0000)]
Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
am:
c60f995ae9
Change-Id: I56841c594e25bd180bd90c8db72fd44e23884db0
Sungsoo [Fri, 9 Sep 2016 22:46:55 +0000 (22:46 +0000)]
DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
am:
56ea7b4901
Change-Id: If8497c9ad514037ce4c1f72dee6f77426d3ecd50
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
dooyoung.hwang [Fri, 9 Sep 2016 21:57:28 +0000 (21:57 +0000)]
Merge "Fix issue that Overview key doesn't work at secondary user" am:
5379f47d85
am:
da9a9da520
Change-Id: I896b6869abe6a89812a5c539dcde8d258c541708
dooyoung.hwang [Fri, 9 Sep 2016 21:52:16 +0000 (21:52 +0000)]
Merge "Fix issue that Overview key doesn't work at secondary user"
am:
5379f47d85
Change-Id: Ieaf3e7261e88f62cbbf748eb9ff94d03711f05c0
Treehugger Robot [Fri, 9 Sep 2016 21:46:04 +0000 (21:46 +0000)]
Merge "Fix issue that Overview key doesn't work at secondary user"
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:49 +0000 (18:42 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
am:
148ccbb082
Change-Id: Iae0ba2b090315eb30c07f9a3f533d18d8a97dbb1
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:35 +0000 (18:42 +0000)]
Update JavaDoc for DragEvent.getLocalState
am:
048f3bfaf0
Change-Id: I53373b3292c4a10a01afa73eb417c105a83c970e
TreeHugger Robot [Fri, 9 Sep 2016 18:34:55 +0000 (18:34 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
Robert Sesek [Fri, 18 Mar 2016 20:52:57 +0000 (16:52 -0400)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.
Bug:
21643067
(cherry picked from commit
94e824bc1b5f83024b7c9a228a8f2d0cd1347d11)
Merged-In: Ie673ee816cae34ac20ffb8c774ec3e6461c3fd0a
Change-Id: I104e6133a90dc93a9854836b5e92d3cd542163a3
Tobias Sargeant [Tue, 19 Jan 2016 16:34:54 +0000 (16:34 +0000)]
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
ba816e0c9efd8cd2aeef618a819a2ad46b742f87)
Merged-In: I4c508a42af7ab7b53d10570ad53b846df7782cc4
Change-Id: I54f04c03443d10dabe6426697d1ff8a0cc66b985
Andreas Huber [Fri, 9 Sep 2016 16:01:35 +0000 (16:01 +0000)]
Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated." am:
077678590f
am:
88c21d596a
Change-Id: Ibe607d46226797ff4d419dcb18d6cfb3388b4c5c
Andreas Huber [Fri, 9 Sep 2016 15:56:30 +0000 (15:56 +0000)]
Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated."
am:
077678590f
Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163
Treehugger Robot [Fri, 9 Sep 2016 15:47:44 +0000 (15:47 +0000)]
Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated."
Narayan Kamath [Fri, 9 Sep 2016 10:52:34 +0000 (10:52 +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
am:
19ebec6d36
Change-Id: Idd19bf7d29385fabf759fed58d8897b5392d4d81
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:44:27 +0000 (10:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c am:
eb972e5d9d
am:
7aba7234e1
Change-Id: I79334b06906a3de8822b93cac6becdd5693e44a0
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
OSDN Git Service
