OSDN Git Service
Paul Stewart [Fri, 26 Aug 2016 18:01:53 +0000 (18:01 +0000)]
Document correct context for obtaining WifiManager am:
0e164b199e
am:
b09557b3cf
Change-Id: I792d164a20e2e98fc58b54bab4f1f43e1eb2fe59
Paul Stewart [Fri, 26 Aug 2016 17:56:03 +0000 (17:56 +0000)]
Document correct context for obtaining WifiManager
am:
0e164b199e
Change-Id: I22ca3647430252345bb7b14e5da693fb9c616789
Allen Hair [Fri, 26 Aug 2016 17:41:15 +0000 (17:41 +0000)]
Merge "Configure code coverage filters." into nyc-mr1-dev am:
6bf296f6dc
am:
baac84303c
Change-Id: I768140d821512e4bdcf813fd9bee25bf31e48f1c
Allen Hair [Fri, 26 Aug 2016 17:41:11 +0000 (17:41 +0000)]
Configure code coverage filters. am:
02fd609460
am:
15b70213a4
Change-Id: Idf84ee3cf08af547ec7564c5e663b7d7fed0c97d
Allen Hair [Fri, 26 Aug 2016 17:33:38 +0000 (17:33 +0000)]
Merge "Configure code coverage filters." into nyc-mr1-dev
am:
6bf296f6dc
Change-Id: I35e24a68a87939defbeb14863baa3cff05a21b06
Allen Hair [Fri, 26 Aug 2016 17:33:35 +0000 (17:33 +0000)]
Configure code coverage filters.
am:
02fd609460
Change-Id: Iae831e68c195abcfa52528ac8609fbbee0be03df
Allen Hair [Fri, 26 Aug 2016 17:28:50 +0000 (17:28 +0000)]
Merge "Configure code coverage filters." into nyc-mr1-dev
Fyodor Kupolov [Fri, 26 Aug 2016 17:06:12 +0000 (17:06 +0000)]
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am:
4be496d2d0
am:
429a0197bf
Change-Id: Ia850b8177732585014563660cf18119e26e691af
Fyodor Kupolov [Fri, 26 Aug 2016 17:06:08 +0000 (17:06 +0000)]
Fix AccountManagerServiceTest am:
d954357860
am:
658b8e7e4b
Change-Id: I01919f31b0bc67ac543f62f030f290d7bddeb9d5
Fyodor Kupolov [Fri, 26 Aug 2016 16:59:28 +0000 (16:59 +0000)]
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev
am:
4be496d2d0
Change-Id: Ibe8cf242b664e9adc53aa6987b7ce25249d2af8f
Fyodor Kupolov [Fri, 26 Aug 2016 16:59:27 +0000 (16:59 +0000)]
Fix AccountManagerServiceTest
am:
d954357860
Change-Id: Iefa213fafbfb9893af659b5300d662e365667e85
Fyodor Kupolov [Fri, 26 Aug 2016 16:52:02 +0000 (16:52 +0000)]
Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev
Dirk Dougherty [Fri, 26 Aug 2016 16:42:35 +0000 (16:42 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818 am:
61f52fca96 am:
be1a09ef47
am:
c49ce72fd8
Change-Id: I74307c44a96e4f4de31a428f546d755dbfd6ccfa
Dirk Dougherty [Fri, 26 Aug 2016 16:42:30 +0000 (16:42 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7 am:
324054e7d4 am:
26901d3715
am:
5e34cccda6
Change-Id: I053971c0b703700bd77560bfe62bcad397e252f6
Dirk Dougherty [Fri, 26 Aug 2016 16:37:32 +0000 (16:37 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818 am:
61f52fca96
am:
be1a09ef47
Change-Id: Ia7c4bbeb19e20c34fb380721186645e4d4057e20
Dirk Dougherty [Fri, 26 Aug 2016 16:37:29 +0000 (16:37 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7 am:
324054e7d4
am:
26901d3715
Change-Id: I2b30eebe6b5c2353556f89e115c10eaabb5f8f13
Dirk Dougherty [Fri, 26 Aug 2016 16:31:29 +0000 (16:31 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818
am:
61f52fca96
Change-Id: I2b3b941677aa5568c26cfb17161cc72b09f3fafe
Dirk Dougherty [Fri, 26 Aug 2016 16:31:29 +0000 (16:31 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am:
c2b9d55818
am:
4019963b96
Change-Id: I55599a76a7a3cc3496e042e7cfaef90e943915c3
Dirk Dougherty [Fri, 26 Aug 2016 16:31:27 +0000 (16:31 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7
am:
9ca38e3379
Change-Id: I6f73d15e0a9b16e20fc76a3c035426365be0f61d
Dirk Dougherty [Fri, 26 Aug 2016 16:31:26 +0000 (16:31 +0000)]
Fetch ga script over https to avoid mixed content. am:
b5760c1fe7
am:
324054e7d4
Change-Id: I245edf657d289265027eee94b9e40395da8ffa9e
Paul Stewart [Mon, 8 Aug 2016 17:20:13 +0000 (10:20 -0700)]
Document correct context for obtaining WifiManager
Added comments to both WifiManager WIFI_SERVICE.
Bug:
25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
Dirk Dougherty [Fri, 26 Aug 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
am:
c2b9d55818
Change-Id: I921f581b8d418cc43d3ad50feaec8ddf233af945
Dirk Dougherty [Fri, 26 Aug 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
am:
c2b9d55818
Change-Id: I8458f037d8992616fbd80faba2d75b042531e0da
Brian Duddie [Fri, 26 Aug 2016 16:25:45 +0000 (16:25 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am:
6bf3424ccf
am:
34230195ab
Change-Id: I15c4909b514e6f996730f35c91a3265cd3004832
Dirk Dougherty [Fri, 26 Aug 2016 16:25:43 +0000 (16:25 +0000)]
Fetch ga script over https to avoid mixed content.
am:
b5760c1fe7
Change-Id: I9cd19eac7a89c2ab5b5f1fd11a98bcdc7b7850ab
Dirk Dougherty [Fri, 26 Aug 2016 16:25:41 +0000 (16:25 +0000)]
Fetch ga script over https to avoid mixed content.
am:
b5760c1fe7
Change-Id: I9cee842d61cb36faebfb17ca0d236195becb8bbe
Andrew Rossignol [Fri, 26 Aug 2016 16:25:41 +0000 (16:25 +0000)]
ContextHub: Avoid reference leaks am:
c35104535c
am:
e2478c4cb6
Change-Id: I1a01b56f53f2016e63e19208074fe50eaddf562d
Dirk Dougherty [Fri, 26 Aug 2016 16:22:05 +0000 (16:22 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
Brian Duddie [Fri, 26 Aug 2016 16:19:54 +0000 (16:19 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev
am:
6bf3424ccf
Change-Id: I8f4c4c76f458420eb76b260a0b356c25e440a45b
Andrew Rossignol [Fri, 26 Aug 2016 16:19:52 +0000 (16:19 +0000)]
ContextHub: Avoid reference leaks
am:
c35104535c
Change-Id: I751f7710a65809be15509fa199be27b643b7a13b
Brian Duddie [Fri, 26 Aug 2016 16:15:56 +0000 (16:15 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev
Neil Fuller [Fri, 26 Aug 2016 15:23:50 +0000 (15:23 +0000)]
Merge "Track java.lang.reflect.Executable API changes" am:
43ec5716aa am:
eefc000601
am:
d8d495f1eb
Change-Id: I67e9aecd97ff9501af2839a80b3430db9678882e
Neil Fuller [Fri, 26 Aug 2016 15:16:56 +0000 (15:16 +0000)]
Merge "Track java.lang.reflect.Executable API changes" am:
43ec5716aa
am:
eefc000601
Change-Id: Ia11ce811cd9a23e4c8979bd5c8429d9f918778bf
Neil Fuller [Fri, 26 Aug 2016 15:09:33 +0000 (15:09 +0000)]
Merge "Track java.lang.reflect.Executable API changes"
am:
43ec5716aa
Change-Id: Id5159236a47ab25ae1cf6b63b7f0fb8f6325a36e
Treehugger Robot [Fri, 26 Aug 2016 15:03:21 +0000 (15:03 +0000)]
Merge "Track java.lang.reflect.Executable API changes"
Jason Monk [Fri, 26 Aug 2016 13:34:55 +0000 (13:34 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev am:
f498d0d384 am:
68d7519060
am:
b481f7ce7d
Change-Id: I8dafa30c6afc9d406064af29fbd8370da3a3a570
Jason Monk [Fri, 26 Aug 2016 13:34:51 +0000 (13:34 +0000)]
Backup system QS tiles am:
baade7573f am:
9813cb61dd
am:
8ed8f1e6a1
Change-Id: I74b572422c0e3b3b90c85df036c8593e49db58f7
Jason Monk [Fri, 26 Aug 2016 13:29:48 +0000 (13:29 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev am:
f498d0d384
am:
68d7519060
Change-Id: I28c4304b0579bc74b21ab2634e261410b98d85b1
Jason Monk [Fri, 26 Aug 2016 13:29:46 +0000 (13:29 +0000)]
Backup system QS tiles am:
baade7573f
am:
9813cb61dd
Change-Id: Ia0ba996f6b0a889ba7469a2272a6fe0c235b15d5
Jason Monk [Fri, 26 Aug 2016 13:24:17 +0000 (13:24 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev
am:
f498d0d384
Change-Id: I3df026ae22d4579c40e2c6532311ad69a3ceb0b7
Jason Monk [Fri, 26 Aug 2016 13:24:14 +0000 (13:24 +0000)]
Backup system QS tiles
am:
baade7573f
Change-Id: Ie601a706cbdcfdb1e836117d02fec914b4acbab1
Jason Monk [Fri, 26 Aug 2016 13:18:52 +0000 (13:18 +0000)]
Merge "Backup system QS tiles" into nyc-dr1-dev
Jason Monk [Thu, 25 Aug 2016 19:57:14 +0000 (15:57 -0400)]
Backup system QS tiles
Add QS tiles to the backup list. Non-system tiles will get removed
since they won't be installed when restore happens.
Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug:
28782938
Neil Fuller [Fri, 19 Aug 2016 16:58:52 +0000 (17:58 +0100)]
Track java.lang.reflect.Executable API changes
Bug:
28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
Greg Kaiser [Fri, 26 Aug 2016 06:05:47 +0000 (06:05 +0000)]
ContextHubService: Avoid uninitialized handle am:
9d4d881cc5
am:
b70ed04911
Change-Id: I4270e1a15961ff2d0b9df5d7a79ec3575f0fecf8
Greg Kaiser [Fri, 26 Aug 2016 05:59:45 +0000 (05:59 +0000)]
ContextHubService: Avoid uninitialized handle
am:
9d4d881cc5
Change-Id: I51c7914c86596c0f9bffc48b6fd08981ef7ea5d9
Greg Kaiser [Wed, 17 Aug 2016 23:27:26 +0000 (16:27 -0700)]
ContextHubService: Avoid uninitialized handle
We avoid ever using uninitialized stack for the value of a handle
which we pass up to the Java layer.
In cleaning up this code a little, we make more explicit a failure
case which already existed: The Context Hub properly loading a
nanoapp, but our Service code failing to set up the infrastructure
to track it. We chose to tell the Java layer we failed in this
case, and more importantly, provide a consistent handle value.
Note that the INVALID_APP_ID is not known by the Java layer, but
it is consistent so future Java code could react to it. At
the very least we will now always have consistent behavior when
this situation happens.
Bug:
30795236
Change-Id: Id4eada529aa1b223867a47985ef1d5c1ba346ea3
Greg Kaiser [Fri, 26 Aug 2016 03:55:55 +0000 (03:55 +0000)]
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev am:
f8d61675ac
am:
a0ce60d36f
Change-Id: I5e57a26d88bfd4906eb2d80db5cd00d4898a65d8
Greg Kaiser [Fri, 26 Aug 2016 03:53:38 +0000 (03:53 +0000)]
NanoAppFilter: Workaround HubId issues am:
3907049080
am:
41ef2a038d
Change-Id: I176e4a4698052d61fd5e9b29a2670a65dfb3643a
Greg Kaiser [Fri, 26 Aug 2016 03:53:34 +0000 (03:53 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev am:
18e59f2988
am:
d06faffad8
Change-Id: I68d8d5463e73c5a30ea18f0009f7e7f48d28a0df
Greg Kaiser [Fri, 26 Aug 2016 03:53:30 +0000 (03:53 +0000)]
ContextHubService: Maintain hub result meaning am:
6d9e7f669a
am:
9ea48989ce
Change-Id: Ida814c62b773f6d0c27f4d4e6fd048ee2a23efc8
Greg Kaiser [Fri, 26 Aug 2016 03:53:25 +0000 (03:53 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev am:
1e07e392c3
am:
d5b81eb77d
Change-Id: I4a2f9c3900c5aadf86ff8d2e51dcfa490eed9d3f
Greg Kaiser [Fri, 26 Aug 2016 03:53:20 +0000 (03:53 +0000)]
ContextHubManager: Fix API documentation. am:
fac5be2ace
am:
921e7ef350
Change-Id: Ib9e190657238ac5663ba96e87b27615e4ea085a6
Greg Kaiser [Fri, 26 Aug 2016 03:48:17 +0000 (03:48 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev am:
6ef2cee605
am:
bb4fbb631c
Change-Id: I73de1171c003098becc51994040e03212abeca5d
Greg Kaiser [Fri, 26 Aug 2016 03:47:44 +0000 (03:47 +0000)]
ContextHubService: Fix app query am:
10163d0dd2
am:
c5ab788398
Change-Id: I4c01c7f9ebb8c3258f29c3ffe73a42fed0fccfb6
Greg Kaiser [Fri, 26 Aug 2016 03:46:56 +0000 (03:46 +0000)]
ContextHubService: Don't double report app loads am:
fe6d4f518a
am:
ca627a8cc3
Change-Id: Ief0783ce04972f00e7ed3637bf3bf54b78e5c55e
Greg Kaiser [Fri, 26 Aug 2016 03:45:38 +0000 (03:45 +0000)]
ContextHubService: Make app handle size match Java am:
f8210797ad
am:
ddf97f6b1f
Change-Id: I0c8209312a757bc00e2776783e45af33651e0783
Greg Kaiser [Fri, 26 Aug 2016 03:45:02 +0000 (03:45 +0000)]
ContextHubService: Update caches on nanoapp unload am:
0d052c9508
am:
e7a0e1a771
Change-Id: I217286efe8e68297cca1354f33ae9bbdde52f58b
Greg Kaiser [Fri, 26 Aug 2016 03:44:50 +0000 (03:44 +0000)]
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev
am:
f8d61675ac
Change-Id: I74a836381312aba711542170dc53df2d7e260876
Greg Kaiser [Fri, 26 Aug 2016 03:44:47 +0000 (03:44 +0000)]
NanoAppFilter: Workaround HubId issues
am:
3907049080
Change-Id: I0b9b272e05bc2ff4ecbc74b5570eda066dedede1
Greg Kaiser [Fri, 26 Aug 2016 03:44:43 +0000 (03:44 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
am:
18e59f2988
Change-Id: Ieaa91254179764a9f15fc7268e83288ad2d4caec
Greg Kaiser [Fri, 26 Aug 2016 03:44:41 +0000 (03:44 +0000)]
ContextHubService: Maintain hub result meaning
am:
6d9e7f669a
Change-Id: I83f2e46782458cf9ac0af8b6f6e07fe8de054425
Greg Kaiser [Fri, 26 Aug 2016 03:37:15 +0000 (03:37 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
am:
1e07e392c3
Change-Id: I03e23ebfe2a29aecc77048edd56797f9fcf24899
Greg Kaiser [Fri, 26 Aug 2016 03:37:12 +0000 (03:37 +0000)]
ContextHubManager: Fix API documentation.
am:
fac5be2ace
Change-Id: I220af0f42791d1210acf9e88da670994f3c6ae45
Greg Kaiser [Fri, 26 Aug 2016 03:37:08 +0000 (03:37 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
am:
6ef2cee605
Change-Id: Iba80d00347392e94d99f5b17deeb8bbf6feaaea1
Greg Kaiser [Fri, 26 Aug 2016 03:37:06 +0000 (03:37 +0000)]
ContextHubService: Fix app query
am:
10163d0dd2
Change-Id: I16ab808c4b8b132e132cbcb6fdcaa76382539356
Greg Kaiser [Fri, 26 Aug 2016 03:36:37 +0000 (03:36 +0000)]
ContextHubService: Don't double report app loads
am:
fe6d4f518a
Change-Id: I00d7537e70ea97c57d4a8e05a05000418c64339e
Greg Kaiser [Fri, 26 Aug 2016 03:35:52 +0000 (03:35 +0000)]
ContextHubService: Make app handle size match Java
am:
f8210797ad
Change-Id: Ia260db17bfe5ee95ab841404a5cada7acce5001e
Greg Kaiser [Fri, 26 Aug 2016 03:34:41 +0000 (03:34 +0000)]
ContextHubService: Update caches on nanoapp unload
am:
0d052c9508
Change-Id: I79ea5f8bba8b0654befb918680db16bda7577f8d
Greg Kaiser [Fri, 26 Aug 2016 03:34:36 +0000 (03:34 +0000)]
Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:34:04 +0000 (03:34 +0000)]
Merge "ContextHubService: Maintain hub result meaning" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:30:16 +0000 (03:30 +0000)]
Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 03:29:19 +0000 (03:29 +0000)]
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
* changes:
ContextHubService: Fix app query
ContextHubService: Don't double report app loads
ContextHubService: Make app handle size match Java
ContextHubService: Update caches on nanoapp unload
Erik Kline [Fri, 26 Aug 2016 01:50:36 +0000 (01:50 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev am:
592552220b
am:
78540f798d
Change-Id: Iab09737b953d8e3383f11f981793f473239c4a6b
Erik Kline [Fri, 26 Aug 2016 01:50:31 +0000 (01:50 +0000)]
Add simple NetdService util class am:
c1bc0be161
am:
b92c7205dd
Change-Id: I82df82eee9d79ffee6a44fc9d77ff2fea713a4b6
Erik Kline [Fri, 26 Aug 2016 01:45:32 +0000 (01:45 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev
am:
592552220b
Change-Id: I561fff2d631a76fbd1abdb10a1b8c4466ebe2cc4
Erik Kline [Fri, 26 Aug 2016 01:45:29 +0000 (01:45 +0000)]
Add simple NetdService util class
am:
c1bc0be161
Change-Id: I67d1ecda70efca7b47d6ebfb79c7da941d51965e
Erik Kline [Fri, 26 Aug 2016 01:40:56 +0000 (01:40 +0000)]
Merge "Add simple NetdService util class" into nyc-mr1-dev
Mark Lu [Fri, 26 Aug 2016 01:35:50 +0000 (01:35 +0000)]
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df" into nyc-mr1-dev am:
000289bc6c
am:
d6cfb23841
Change-Id: I9070aff36165453a6ae65775224a12229baeff5a
Mark Lu [Fri, 26 Aug 2016 01:29:22 +0000 (01:29 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df am:
4b492cbf09
am:
3e0f9837f3
Change-Id: Ie32c4dca0bee286ab44367ff18c516219b8e6c3f
Mark Lu [Fri, 26 Aug 2016 01:29:18 +0000 (01:29 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev am:
6be20ff728
am:
426a9411a2
Change-Id: Ibe1229f61e1abf22249bdff149c3e274fb1ca170
Mark Lu [Fri, 26 Aug 2016 01:29:14 +0000 (01:29 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c am:
86caa4aebf
am:
b48098f836
Change-Id: I4b05e82124db8806d5d4eb6622bd107d5d038456
Winson Chung [Fri, 26 Aug 2016 01:29:10 +0000 (01:29 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev am:
5ebd73f8ff
am:
ba4744bc08
Change-Id: I595e3d60cbfb84ea0b257635c9ffaf9d98b3c4c9
Winson [Fri, 26 Aug 2016 01:29:06 +0000 (01:29 +0000)]
Fixing typo in dump log. am:
b43ba86811
am:
1de1a3bfcc
Change-Id: I0ccfedd4bc9028ab150792ba974a1f70912ef631
Mark Lu [Fri, 26 Aug 2016 01:26:33 +0000 (01:26 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
ceaef72fb9 am:
a5f090a768
am:
975704a737
Change-Id: I13fe67ed9d59918f36d33befc3d285d3a60cde6d
Mark Lu [Fri, 26 Aug 2016 01:26:29 +0000 (01:26 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
f496b9a981 am:
e16c82d224
am:
bfe0c86461
Change-Id: I8e4c19a43179c2816393929d1dff76f57a68185a
Suprabh Shukla [Fri, 26 Aug 2016 01:26:25 +0000 (01:26 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am:
769bc6c8b1
am:
9dbdbf461e
Change-Id: I1e1e59ffd721807729bc9692767214d86faf0f90
Suprabh Shukla [Fri, 26 Aug 2016 01:26:22 +0000 (01:26 +0000)]
Resolving race condition while writing recent taskids am:
fd0bd4f39d
am:
c9e7c49def
Change-Id: Ib52cdb13519da68f04e3581cd6e3bb5dd796b12c
Sudheer Shanka [Fri, 26 Aug 2016 01:26:17 +0000 (01:26 +0000)]
Merge "resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3 am:
c2a760e68c am:
77dec89bb3 am:
203d1bee25 am:
7a46fac0cd" into nyc-dev am:
fea9feb30e am:
c3a6dbd46e am:
5d146ccdb8
am:
1167bcf2c9
Change-Id: I7320b8af540b246dd3c74963ea001bacabe0dab2
Android Build Merger (Role) [Fri, 26 Aug 2016 01:23:03 +0000 (01:23 +0000)]
Merge "resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3 am:
c2a760e68c am:
77dec89bb3 am:
203d1bee25 am:
7a46fac0cd am:
d57565864b am:
c18b88c15d am:
1c153c697b am:
20e7a6b448" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:49 +0000 (01:22 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours am:
603a69ffb4 am:
97194798ab am:
c35a9fed39 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
2ea71d8c64 am:
2c18f32328 am:
7a50c5afd2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:35 +0000 (01:22 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours am:
603a69ffb4 am:
97194798ab am:
c35a9fed39 am:
71933abbdc -s ours am:
02ba5ef875 am:
26fa4042e1 am:
c16baae14f am:
c44432439f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:17 +0000 (01:22 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
d8ffc6239b am:
710c5ea5a6 am:
586fa0cefd" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 26 Aug 2016 01:22:04 +0000 (01:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours am:
4a3caefd6c am:
f7259775d8 am:
216e40b926 am:
3025752705" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Fri, 26 Aug 2016 01:21:10 +0000 (01:21 +0000)]
resolve merge conflicts of
270947f to klp-modular-dev am:
76c4b2a7b6 -s ours am:
bbbb514bc9 am:
6a50270944 am:
a0994c6d58 am:
cdf70ba0a3 am:
c2a760e68c am:
77dec89bb3 am:
203d1bee25 am:
7a46fac0cd am:
d57565864b am:
c18b88c15d am:
1c153c697b
am:
20e7a6b448
Change-Id: I10401ad30ecb89cd75e66297d22d92dcf5f3a0b9
Sudheer Shanka [Fri, 26 Aug 2016 01:21:06 +0000 (01:21 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours am:
603a69ffb4 am:
97194798ab am:
c35a9fed39 am:
71933abbdc -s ours" into nyc-dev am:
cca29c7284 am:
2ea71d8c64 am:
2c18f32328
am:
7a50c5afd2
Change-Id: Id236d24f004932ce6d103a084f520bf7834cb51a
Sudheer Shanka [Fri, 26 Aug 2016 01:21:02 +0000 (01:21 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am:
96052ea905 -s ours am:
f368bdee06 am:
f21534a288 am:
dfc2d0a4bc -s ours am:
603a69ffb4 am:
97194798ab am:
c35a9fed39 am:
71933abbdc -s ours am:
02ba5ef875 am:
26fa4042e1 am:
c16baae14f
am:
c44432439f
Change-Id: Ie463c5ce2b22b371ecde5d137cdd6ecf0c775d34
Amith Yamasani [Fri, 26 Aug 2016 01:20:58 +0000 (01:20 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours" into nyc-dev am:
5f5403def8 am:
d8ffc6239b am:
710c5ea5a6
am:
586fa0cefd
Change-Id: Ibaa9d0cb12eae2180eef3133f418845e4edbe207
Amith Yamasani [Fri, 26 Aug 2016 01:20:55 +0000 (01:20 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
a92810a189 -s ours am:
9be12f8986 am:
03b0f5c3ec am:
7b8140652b -s ours am:
9080d4462e am:
75c7391a41 am:
f6361752ca am:
7586e03e06 -s ours am:
4a3caefd6c am:
f7259775d8 am:
216e40b926
am:
3025752705
Change-Id: I2ae37c82ae8a36d026b3b18f9706674e49a5881f
Android Build Merger (Role) [Fri, 26 Aug 2016 01:18:58 +0000 (01:18 +0000)]
Merge "Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am:
5e55214ab7 am:
c8aedeeaf6 am:
26bb7bf86c -s ours am:
86ac88ccdb am:
2490679d7e am:
2f664374fa am:
bc5775c18b -s ours" into nyc-dev am:
555fbf30d2 am:
12a668fde8 am:
148acfcb45 am:
cb6f2eeb33" into nyc-mr1-dev-plus-aosp
OSDN Git Service
