OSDN Git Service
Phil Weaver [Tue, 18 Jul 2017 22:44:52 +0000 (22:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
ad09c7e7d0" into oc-dr1-dev-plus-aosp
am:
1ccec78121
Change-Id: I539d83d710a1814dcf93fd0a8a5e782d82c4ca88
Phil Weaver [Tue, 18 Jul 2017 22:43:02 +0000 (22:43 +0000)]
Merge "Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852 am:
412614bcdf" into oc-dr1-dev-plus-aosp
am:
3f16f7bf51
Change-Id: I169e9cbf7656a1f0ef3e51f754c622ad7243abe7
Phil Weaver [Tue, 18 Jul 2017 22:41:14 +0000 (22:41 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018 am:
3700014be0 am:
b086ea50bb
am:
d88cf7f597
Change-Id: I3a39d335642d29d274d5c0101c717a03ea6f3759
nharold [Tue, 18 Jul 2017 22:39:38 +0000 (22:39 +0000)]
Merge "Launch NetD in a different thread" am:
c721dce3fc am:
709f3c1d46 am:
cd3633fc01
am:
d122f4e811
Change-Id: I64abc4069121180f873906d6e30035aec139b612
Phil Weaver [Tue, 18 Jul 2017 22:37:10 +0000 (22:37 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
2b57d28b4c
am:
05ce47aa25
Change-Id: I8f1bd0568b423511c5463f3216fc77c1b5d832f0
Android Build Merger (Role) [Tue, 18 Jul 2017 22:31:57 +0000 (22:31 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d am:
ad09c7e7d0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 18 Jul 2017 22:29:10 +0000 (22:29 +0000)]
Merge "Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852 am:
412614bcdf" into oc-dr1-dev-plus-aosp
Phil Weaver [Tue, 18 Jul 2017 22:28:02 +0000 (22:28 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d
am:
ad09c7e7d0
Change-Id: Ie350f5269916c26185a927778781e5de1e8d564e
Phil Weaver [Tue, 18 Jul 2017 22:27:39 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours am:
442fc85852
am:
412614bcdf
Change-Id: I30e5b309406a5dd59728fc5ec101ccdbd810064a
Phil Weaver [Tue, 18 Jul 2017 22:25:39 +0000 (22:25 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018 am:
3700014be0
am:
b086ea50bb
Change-Id: I2e45ee8c02a879f534b925a859edb6475384a0c0
nharold [Tue, 18 Jul 2017 22:23:55 +0000 (22:23 +0000)]
Merge "Launch NetD in a different thread" am:
c721dce3fc am:
709f3c1d46
am:
cd3633fc01
Change-Id: Ifaaa918e1ade21609ef1615d9315c44d89a23a6d
Tom Cherry [Tue, 18 Jul 2017 22:22:25 +0000 (22:22 +0000)]
Merge "Remove ALOGD_IF_SLOW" am:
b793aa8c81 -s ours am:
3ed109136c -s ours am:
597556e119 -s ours
am:
5197be4305 -s ours
Change-Id: I9a101f4c0636e601bdd54aec05c46a90d0a0f302
TreeHugger Robot [Tue, 18 Jul 2017 22:17:45 +0000 (22:17 +0000)]
Merge "Do not register for broadcasts within NoMan test."
Phil Weaver [Tue, 18 Jul 2017 22:15:41 +0000 (22:15 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours am:
4607ec8f6d
am:
2b57d28b4c
Change-Id: I8f29f74973582b0ec58ece2ddae423fd31cb06d6
Neil Fuller [Tue, 18 Jul 2017 22:14:18 +0000 (22:14 +0000)]
Merge "Remove a TODO associate with starting a thread" am:
c685e1e4a1 am:
d61516d7b5 am:
70267e2d45
am:
4a5505008f
Change-Id: I6e5dd67d93156e7670dd30c52fd37b48e5d279a9
Phil Weaver [Tue, 18 Jul 2017 22:08:34 +0000 (22:08 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours
am:
442fc85852
Change-Id: I2332b61077924a2c8c5cdad5f440acb856db4acf
Steven Moreland [Tue, 18 Jul 2017 22:05:50 +0000 (22:05 +0000)]
Merge "Merge "Reference nativehelper/jni.h as jni.h" am:
899a1f23c5 am:
d2bf323c40 am:
238be4a67b" into oc-dr1-dev-plus-aosp
am:
319a28880e
Change-Id: I082d52f29c824dc6534f73ab073b520091057a2c
Tom Cherry [Tue, 18 Jul 2017 22:03:32 +0000 (22:03 +0000)]
Merge "Remove ALOGD_IF_SLOW" am:
b793aa8c81 -s ours am:
3ed109136c -s ours
am:
597556e119 -s ours
Change-Id: Ibfd28f001845c0ace0297e6d280c4d1a08e4106d
Neil Fuller [Tue, 18 Jul 2017 22:00:36 +0000 (22:00 +0000)]
Merge "Remove a TODO associate with starting a thread" am:
c685e1e4a1 am:
d61516d7b5
am:
70267e2d45
Change-Id: Ic8c18e74df95bbe8aeb26090a03e62c2dd80eea3
Phil Weaver [Tue, 18 Jul 2017 22:00:32 +0000 (22:00 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018 am:
3700014be0 am:
df6486e37f
am:
e344a25184
Change-Id: Iecbff3273dfa32e9851777c420f87aae9c9188d8
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7
am:
cfbe89ad32 -s ours
Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e
Phil Weaver [Tue, 18 Jul 2017 21:57:16 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: Ic51570a1b13563cd084cd03389d4cf7f2654df8b
Phil Weaver [Tue, 18 Jul 2017 21:57:14 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36
Android Build Merger (Role) [Tue, 18 Jul 2017 21:54:34 +0000 (21:54 +0000)]
Merge "Merge "Reference nativehelper/jni.h as jni.h" am:
899a1f23c5 am:
d2bf323c40 am:
238be4a67b" into oc-dr1-dev-plus-aosp
Steven Moreland [Tue, 18 Jul 2017 21:51:49 +0000 (21:51 +0000)]
Merge "Reference nativehelper/jni.h as jni.h" am:
899a1f23c5 am:
d2bf323c40
am:
238be4a67b
Change-Id: Icb75bc6c2ba9750349de0e4f0ea15c29b5502b7b
Phil Weaver [Tue, 18 Jul 2017 21:51:00 +0000 (21:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018 am:
3700014be0
am:
df6486e37f
Change-Id: Id106d8c3d4e805003eec8f8e9e1eb8c8f681a5a6
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f
am:
ac700bc3c7
Change-Id: If57bab0ee9d5459286339845284adb3f0163c401
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:44:01 +0000 (21:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: Id7dbefd2586c25730efc719bd787cdf70c98c7f0
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c
am:
b2e3fb162f
Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e
Phil Weaver [Tue, 18 Jul 2017 21:31:32 +0000 (21:31 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: I4d831e16f45fd2855a257551fa55182147b7bf2e
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f
am:
27ad1fbc2c
Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69
am:
783253f6db
Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours
am:
bbb567757f
Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae
am:
aa8976fa69
Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e
am:
a1dca32957
Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours
am:
f44b48acae
Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94
am:
7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c
am:
b968d99e3e
Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d
am:
cf7ce06abd -s ours
Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89
am:
83261a8b5c
Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed
am:
62eca82f89
Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c
am:
68f7106cf4
Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e
am:
e11e076fed
Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240
am:
219d9b5dfb
Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours
am:
5d46833d9c
Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5
am:
e06843fe7e
Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2
Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours
am:
76007bb240
Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2
Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours
am:
68efc2e5b5
Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e
Lucas Dupin [Tue, 18 Jul 2017 20:34:49 +0000 (20:34 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev am:
bc907cf9a8
am:
11e0e33756
Change-Id: Ifcb92445f6e8cda2a2c9eb4350be65937ea5787b
Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e
am:
37cf6265db -s ours
Change-Id: I28f848331e5379736dd777995fe844aa5c5df689
nharold [Tue, 18 Jul 2017 20:29:07 +0000 (20:29 +0000)]
Merge "Launch NetD in a different thread" am:
c721dce3fc
am:
709f3c1d46
Change-Id: Id0a51ae3563a4956c4f81174883b43c64bdac892
Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1
am:
ccbac7e9e0 -s ours
Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37
Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6
am:
3c4d24923c -s ours
Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f
Lucas Dupin [Tue, 18 Jul 2017 20:24:53 +0000 (20:24 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am:
bc907cf9a8
Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05
Tom Cherry [Tue, 18 Jul 2017 20:23:13 +0000 (20:23 +0000)]
Merge "Remove ALOGD_IF_SLOW" am:
b793aa8c81 -s ours
am:
3ed109136c -s ours
Change-Id: I50d0afc6af9a7462abf836e2dc5a9072b71c288b
Neil Fuller [Tue, 18 Jul 2017 20:21:07 +0000 (20:21 +0000)]
Merge "Remove a TODO associate with starting a thread" am:
c685e1e4a1
am:
d61516d7b5
Change-Id: Ia2b6fd41e3a804ec9c6e5238f6ba53495de764e9
nharold [Tue, 18 Jul 2017 20:18:10 +0000 (20:18 +0000)]
Merge "Launch NetD in a different thread"
am:
c721dce3fc
Change-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2
Steven Moreland [Tue, 18 Jul 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Reference nativehelper/jni.h as jni.h" am:
899a1f23c5
am:
d2bf323c40
Change-Id: I8bf7c9505ed31d0e248775455c0a88c836af2754
Tom Cherry [Tue, 18 Jul 2017 20:13:25 +0000 (20:13 +0000)]
Merge "Remove ALOGD_IF_SLOW"
am:
b793aa8c81 -s ours
Change-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7
TreeHugger Robot [Tue, 18 Jul 2017 20:11:59 +0000 (20:11 +0000)]
Merge "Add a system property support to disable background dexopt job"
Svetoslav Ganov [Tue, 18 Jul 2017 20:11:19 +0000 (20:11 +0000)]
Merge "Don't reset review state until no permission requires a review."
Geoffrey Pitsch [Tue, 18 Jul 2017 14:35:22 +0000 (10:35 -0400)]
Do not register for broadcasts within NoMan test.
Fixes potential flake when broadcasts come in after Looper has
terminated.
Change-Id: Id63d27970b1ffacccfa8f1b074f744b6547ffcf9
Fixes:
63797731
Test: runtest systemui-notification
Neil Fuller [Tue, 18 Jul 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Remove a TODO associate with starting a thread"
am:
c685e1e4a1
Change-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25
TreeHugger Robot [Tue, 18 Jul 2017 20:08:58 +0000 (20:08 +0000)]
Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
Steven Moreland [Tue, 18 Jul 2017 20:05:36 +0000 (20:05 +0000)]
Merge "Reference nativehelper/jni.h as jni.h"
am:
899a1f23c5
Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
Daniel Nishi [Tue, 18 Jul 2017 20:02:34 +0000 (20:02 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev am:
d332076636
am:
5ec6335b74
Change-Id: Iee4b88878f5784172e363c9670f234bda092c6fd
Rob Carr [Tue, 18 Jul 2017 20:01:05 +0000 (20:01 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev am:
cee8098178
am:
228571391e
Change-Id: Idd2a3c23233f0758cc96a55da97b99c6ee8a7c94
Geoffrey Pitsch [Tue, 18 Jul 2017 19:59:31 +0000 (19:59 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev am:
f80ec1583d
am:
0a0f7cea05 -s ours
Change-Id: Ie0978bbc4c2804563f7b62eb943a617ab634f95a
TreeHugger Robot [Tue, 18 Jul 2017 19:51:58 +0000 (19:51 +0000)]
Merge "[AsyncChannel] Fix race in handling of sync result"
Daniel Nishi [Tue, 18 Jul 2017 19:44:33 +0000 (19:44 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev
am:
d332076636
Change-Id: I623d431fe052649ee2bf80a6ab459f6424f7e9e0
TreeHugger Robot [Tue, 18 Jul 2017 19:42:07 +0000 (19:42 +0000)]
Merge "Internationalize ZoneGetter properly"
Rob Carr [Tue, 18 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev
am:
cee8098178
Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59
Geoffrey Pitsch [Tue, 18 Jul 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
am:
f80ec1583d
Change-Id: Id03863d7f6bb6a10ac82c504c3c64227e7286cd6
Daniel Nishi [Tue, 18 Jul 2017 19:34:42 +0000 (19:34 +0000)]
Merge "Add home activity methods to wrapper." into oc-dr1-dev
Rob Carr [Tue, 18 Jul 2017 19:31:00 +0000 (19:31 +0000)]
Merge "Fix rotation animation selection." into oc-dr1-dev
Geoffrey Pitsch [Tue, 18 Jul 2017 19:30:28 +0000 (19:30 +0000)]
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
Charles He [Tue, 18 Jul 2017 18:47:45 +0000 (18:47 +0000)]
Merge "Opt-out for always-on VPN"
Lucas Dupin [Tue, 18 Jul 2017 18:45:46 +0000 (18:45 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev am:
df83b8cfcf
am:
6ee8fc2347
Change-Id: Ic77e64ebb731ba3f6416adade2ecd96ca27ae058
Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours
am:
954deb1c6e
Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483
Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev
am:
a620b21828 -s ours
Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf
Phil Weaver [Tue, 18 Jul 2017 18:36:21 +0000 (18:36 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours
am:
ff115bffb1
Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70
Lucas Dupin [Tue, 18 Jul 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
am:
df83b8cfcf
Change-Id: Id2b3ebf54192171f81028da83469a9efdc2840ea
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/
62196835
am:
fd0ca151a6
Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247
Phil Weaver [Tue, 18 Jul 2017 18:26:57 +0000 (18:26 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835
am:
24fdc53cfe -s ours
Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476
TreeHugger Robot [Tue, 18 Jul 2017 18:23:55 +0000 (18:23 +0000)]
Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev
nharold [Tue, 18 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Launch NetD in a different thread"
Robert Quattlebaum [Tue, 18 Jul 2017 17:30:41 +0000 (17:30 +0000)]
Merge changes from topic 'android-lowpan-next'
* changes:
lowpan: AIDL refactor to no longer use property design pattern
LowpanException: Refactor exception handling
lowpan: Introduce new unit tests for data classes
lowpan: Make various data classes Parcelable
lowpan: Remove libandroid_net_lowpan from platform/frameworks/base
LowpanEnergyScanResult: Remove `public` designation from setChannel/setMaxRssi
TreeHugger Robot [Tue, 18 Jul 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Add log when we are trying to dismiss keyguard"
TreeHugger Robot [Tue, 18 Jul 2017 17:21:49 +0000 (17:21 +0000)]
Merge "Don't move stack to bottom when creating task at bottom"
Tom Cherry [Tue, 18 Jul 2017 17:20:39 +0000 (17:20 +0000)]
Merge "Remove ALOGD_IF_SLOW"
Bryce Lee [Tue, 18 Jul 2017 17:15:23 +0000 (17:15 +0000)]
Merge "Ensure home activity always is on home stack." into oc-dr1-dev am:
560acb043d
am:
0d2c7dace3
Change-Id: I1399f6c7425d8f7e3ef6c69a25b67b96597574b1
Shubham Ajmera [Fri, 14 Jul 2017 01:46:02 +0000 (18:46 -0700)]
Add a system property support to disable background dexopt job
Bug:
34812714
Test: Verified the property value on the device
Change-Id: Ibfa46f90a8df772eb684c0e5bd421e46a5798a85
Shubham Ajmera [Tue, 18 Jul 2017 17:09:06 +0000 (17:09 +0000)]
Merge "Reduce app size by downgrading inactive apps"