OSDN Git Service
Daniel Chapin [Sat, 27 Aug 2016 01:25:07 +0000 (01:25 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev am:
7c02d7adaa
am:
26aec7300d
Change-Id: I352e41cf2de7c4106e0fe4887ebd0f17b695f55b
Adam Powell [Sat, 27 Aug 2016 01:25:05 +0000 (01:25 +0000)]
Fixes for ImageView drawable visibility dispatch am:
06f9eb8b62
am:
fd86f7fdfd
Change-Id: I155ed970c7f58895419778f01eebc5babb141c33
Daniel Chapin [Sat, 27 Aug 2016 01:19:31 +0000 (01:19 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
am:
7c02d7adaa
Change-Id: Iea12e62f45fb097507282d461be69d1dd83fd5a0
Adam Powell [Sat, 27 Aug 2016 01:19:28 +0000 (01:19 +0000)]
Fixes for ImageView drawable visibility dispatch
am:
06f9eb8b62
Change-Id: I8b7d8c73f0a718963a191fd5460517e5a7445974
Daniel Chapin [Sat, 27 Aug 2016 01:14:33 +0000 (01:14 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev
Chong Zhang [Fri, 26 Aug 2016 23:33:30 +0000 (23:33 +0000)]
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev am:
19628b251d
am:
80c031cbd4
Change-Id: Id647b704035509a3b2bd0611a0efe78da3ede668
Chong Zhang [Fri, 26 Aug 2016 23:33:27 +0000 (23:33 +0000)]
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am:
813be138ae
am:
9f92bc2602
Change-Id: I94e29886a23fc829b4608a908df90746a4d794e5
Chong Zhang [Fri, 26 Aug 2016 23:28:22 +0000 (23:28 +0000)]
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
am:
19628b251d
Change-Id: Iac98c996ba13b59319a12b089be234366a8e7213
Chong Zhang [Fri, 26 Aug 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
am:
813be138ae
Change-Id: Id64071882a0b90212b92234a4d0bdc67f2ee5e1a
Chong Zhang [Fri, 26 Aug 2016 23:22:08 +0000 (23:22 +0000)]
Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
Adam Powell [Thu, 25 Aug 2016 00:09:01 +0000 (17:09 -0700)]
Fixes for ImageView drawable visibility dispatch
Some apps rely on their drawables not getting not-visible hints via
setVisible when the window visibility changes. This manifests as
additional animations, such as crossfading from placeholders when the
window becomes visible again.
Apps should be able to handle this case in the future now that we have
more detailed reporting via onVisibilityAggregated, but to keep
existing apps working as-is, ImageView now operates in a compatibility
mode for targetSdkVersion < N and will only dispatch visibility
signals based on the same triggers used in M. New apps get the more
detailed signals.
Fix a bug where window visibility dispatch via onVisibilityAggregated
would double-dispatch "not visible" when the window is transitioning
from GONE => INVISIBLE or INVISIBLE => GONE.
Make the growing set of compatibility check fields in ImageView
static, matching the pattern from View.
Bug
30216207
Change-Id: I88875260bf6aaa23687c7d51353de8d633383531
Todd Kennedy [Fri, 26 Aug 2016 22:46:44 +0000 (22:46 +0000)]
Enable web action apps based on system setting
am:
efc1c4d501
Change-Id: I2c8c12aebddecb920d1924c4a04f96acdcd3cc02
Chong Zhang [Thu, 25 Aug 2016 19:12:33 +0000 (12:12 -0700)]
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
Restrict saved surface to launcher start (ACTION_MAIN&CATEGORY_
LAUNCHER), or there is no intent at all (eg. task being brought to
front). If the intent is something else, likely the app is going
to show some specific page or view, instead of what's left last time.
This solves problems like the launcher shortcuts on DeckClock,
each of them is a different intent and will show one specific
view regardless of last states. Another example is Chrome tab
opened directly by action VIEW to open some URL.
(Note that this doesn't solve the problem with Chrome homescreen
shortcuts, it will still start with saved surface (if Chrome
is already open). This is because the shortcut is a trampoline
activity that starts the real chrome tab activity, but when
the trampoline is started, the whole task is already brought
to front, and ChromeTab could become visible with the task
before we actually start it.)
bug:
31055479
bug:
27747315
Change-Id: Id3e61c61ef516b0edc1f174320f02661222f226b
(cherry picked from commit
ad24f96def42016049de05220593aa049b136def)
Todd Kennedy [Thu, 21 Jul 2016 14:44:33 +0000 (07:44 -0700)]
Enable web action apps based on system setting
Bug:
28140107
Change-Id: I4cff49165be6432404b9a616ca35bee249daab2a
Tyler Gunn [Fri, 26 Aug 2016 20:33:58 +0000 (20:33 +0000)]
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev
am:
020212c7df
Change-Id: I4f8f1b6fb133e2d4b0cbde1da872565aecffc86f
Tyler Gunn [Fri, 26 Aug 2016 20:33:09 +0000 (20:33 +0000)]
Add device config to determine when "allow hold" carrier config is used.
am:
d81c426e1d
Change-Id: Idd16d4b9977fa0773b788931ed77f8f0f3d8e8dd
Todd Kennedy [Fri, 26 Aug 2016 20:32:48 +0000 (20:32 +0000)]
Merge "Implement new ephemeral resolver design" into nyc-mr1-dev
am:
80855e154e
Change-Id: Ib3d489768ec906a3078d1b14b850121917daf38c
Todd Kennedy [Fri, 26 Aug 2016 20:32:45 +0000 (20:32 +0000)]
Implement new ephemeral resolver design
am:
fea1b776e9
Change-Id: Ied8a583de6247a5d826805dfbb5e8edbecdcdb27
Tyler Gunn [Fri, 26 Aug 2016 20:28:33 +0000 (20:28 +0000)]
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev
TreeHugger Robot [Fri, 26 Aug 2016 20:28:02 +0000 (20:28 +0000)]
Merge "Implement new ephemeral resolver design" into nyc-mr1-dev
Tyler Gunn [Wed, 3 Aug 2016 17:53:52 +0000 (10:53 -0700)]
Add device config to determine when "allow hold" carrier config is used.
The "allow hold" carrier config option was added to meet new carrier
requirements. However we do not wish to enforce this option on older
devices.
Bug:
30449352
Change-Id: I4bf6dab0a200bdd2511c67b8134c6c0dc4b7e5a8
Jorim Jaggi [Fri, 26 Aug 2016 19:46:36 +0000 (19:46 +0000)]
Play sound on ACTION_DOWN for navigation keys
am:
05bce15da9
Change-Id: I99ee8746b710c131dcd781a1623aa3b5edbbc84d
Jorim Jaggi [Fri, 26 Aug 2016 01:14:14 +0000 (18:14 -0700)]
Play sound on ACTION_DOWN for navigation keys
Change-Id: I83a39aa9ba2519952cb723d72c66203881c9b3b5
Fixes:
30837708
Brian Duddie [Fri, 26 Aug 2016 18:27:53 +0000 (18:27 +0000)]
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev
am:
73f511e471
Change-Id: Ie8a7f62675bf60436d1262098d0a550692d70b02
Greg Kaiser [Fri, 26 Aug 2016 18:27:50 +0000 (18:27 +0000)]
ContextHubManager: Document InstanceInfo bug
am:
3be73d3950
Change-Id: I8a1418086d7e9c4f60205234394dd1cc8d1215df
Brian Duddie [Fri, 26 Aug 2016 18:20:17 +0000 (18:20 +0000)]
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev
Paul Stewart [Fri, 26 Aug 2016 17:56:05 +0000 (17:56 +0000)]
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev
am:
855210170c
Change-Id: I686a984b32b8a8bfe6d221e5cf543b2137199a1b
Paul Stewart [Fri, 26 Aug 2016 17:56:03 +0000 (17:56 +0000)]
Document correct context for obtaining WifiManager
am:
0e164b199e
Change-Id: I22ca3647430252345bb7b14e5da693fb9c616789
TreeHugger Robot [Fri, 26 Aug 2016 17:50:18 +0000 (17:50 +0000)]
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev
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 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: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: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: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: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
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
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: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: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:12:19 +0000 (01:12 +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
Change-Id: I10b8f167ea4a50de0d3618042943967cc7d2796c
Mark Lu [Fri, 26 Aug 2016 01:12:17 +0000 (01:12 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df
am:
4b492cbf09
Change-Id: I8cb4b23b821f2d7c9b9de08a9d3bcc1e8b73552e
Mark Lu [Fri, 26 Aug 2016 01:12:11 +0000 (01:12 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev
am:
6be20ff728
Change-Id: I600749a9f808f801823ec1582448854522b2e292
Mark Lu [Fri, 26 Aug 2016 01:12:09 +0000 (01:12 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c
am:
86caa4aebf
Change-Id: Ib44ae881aefaac87625dc86c14f6144f0f7d2fbc
Winson Chung [Fri, 26 Aug 2016 01:12:02 +0000 (01:12 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev
am:
5ebd73f8ff
Change-Id: I2d3428c779fe20db8c12987de5b7f8f2f2c2f6ff
Winson [Fri, 26 Aug 2016 01:12:00 +0000 (01:12 +0000)]
Fixing typo in dump log.
am:
b43ba86811
Change-Id: Ied127cb30a1dabe9d44c4da7b44c3c9758b74afa
Mark Lu [Fri, 26 Aug 2016 01:11:57 +0000 (01:11 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1 am:
ceaef72fb9
am:
a5f090a768
Change-Id: Iacb60ee1d22b56d6b4ad8ebb2cdb2be841fd7a28
Mark Lu [Fri, 26 Aug 2016 01:11:55 +0000 (01:11 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8 am:
f496b9a981
am:
e16c82d224
Change-Id: I5d3c04608f9a3cbf216d3a6c9ef2ac7bad1ebec8
Android Build Merger (Role) [Fri, 26 Aug 2016 01:05:07 +0000 (01:05 +0000)]
Merge "Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1 am:
b3ab8337df" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 26 Aug 2016 01:04:57 +0000 (01:04 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e am:
bae52ec98c" into nyc-mr1-dev
Winson Chung [Fri, 26 Aug 2016 01:04:48 +0000 (01:04 +0000)]
Merge "Fixing typo in dump log." into nyc-mr1-dev
Mark Lu [Fri, 26 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev am:
314d995ca1
am:
b3ab8337df
Change-Id: I0dc06d19b3ec64fa6c3852f908d4cb21768ca34d
Mark Lu [Fri, 26 Aug 2016 01:03:59 +0000 (01:03 +0000)]
docs: Fix typo and broken link in AsyncTask.java am:
53415ff24e
am:
bae52ec98c
Change-Id: Idb695142488874d52dd406bede0fb4848f7663a9
Mark Lu [Fri, 26 Aug 2016 01:03:57 +0000 (01:03 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev am:
3c638c1ea1
am:
ceaef72fb9
Change-Id: I182c0a0e1656308e4001f4f74751091023cae42d
Mark Lu [Fri, 26 Aug 2016 01:03:56 +0000 (01:03 +0000)]
docs: fix link in Loader reference page am:
9f52b7a4a8
am:
f496b9a981
Change-Id: I7a7ee695fadb2e0774ef84724a4320fc73b45a88
Mark Lu [Fri, 26 Aug 2016 00:54:02 +0000 (00:54 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
am:
314d995ca1
Change-Id: Idf4e30a184c086f360db24b2360cef758e2ea36d
Mark Lu [Fri, 26 Aug 2016 00:53:59 +0000 (00:53 +0000)]
docs: Fix typo and broken link in AsyncTask.java
am:
53415ff24e
Change-Id: I1fd10e79a2af2db5bc175dcc4126d3f88c35f4b1
Mark Lu [Fri, 26 Aug 2016 00:53:55 +0000 (00:53 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
am:
3c638c1ea1
Change-Id: I90e2cc4100d130299bfd7094fe727c405773f64e
Mark Lu [Fri, 26 Aug 2016 00:53:53 +0000 (00:53 +0000)]
docs: fix link in Loader reference page
am:
9f52b7a4a8
Change-Id: I32164f55f9b42dc50f13756c942644350a7d643e
Suprabh Shukla [Fri, 26 Aug 2016 00:47:30 +0000 (00:47 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
am:
769bc6c8b1
Change-Id: I77cb537a42cd3e96396f329dfaec13ff17aff167
Suprabh Shukla [Fri, 26 Aug 2016 00:47:27 +0000 (00:47 +0000)]
Resolving race condition while writing recent taskids
am:
fd0bd4f39d
Change-Id: I2bfd5c68c6a5a9989a9dab6038313a5d5849b765
Mark Lu [Fri, 26 Aug 2016 00:46:03 +0000 (00:46 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
Mark Lu [Fri, 26 Aug 2016 00:46:00 +0000 (00:46 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev
TreeHugger Robot [Fri, 26 Aug 2016 00:39:42 +0000 (00:39 +0000)]
Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev
Allen Hair [Thu, 25 Aug 2016 23:06:26 +0000 (16:06 -0700)]
Configure code coverage filters.
Bug:
28269038
Change-Id: If4dfb769d543e70faea7200dc1da15c50a83270f
Fyodor Kupolov [Thu, 25 Aug 2016 22:09:22 +0000 (15:09 -0700)]
Fix AccountManagerServiceTest
Unregister AccountManagerInternal before creating a new instance of
AccountManagerService, otherwise it will cause:
java.lang.IllegalStateException: Overriding service registration
Also overrode MockPm.addOnPermissionsChangeListener to be a noop and
not throw an exception.
Bug:
31071079
Change-Id: I0d24232eba655a68bf3fb38d7aa9edb92d469cea
Sudheer Shanka [Fri, 26 Aug 2016 00:16:36 +0000 (00:16 +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
Change-Id: I5d1d23c9dabb84d0b2b30ff63b387c93c63c6c31
Sudheer Shanka [Fri, 26 Aug 2016 00:16:31 +0000 (00:16 +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
Change-Id: Icf46f69f758b53f4894dfec4efd3a4e86e7b26d4
OSDN Git Service
