OSDN Git Service
Yi Kong [Mon, 29 Aug 2016 08:15:53 +0000 (08:15 +0000)]
Merge "Track getxattr API change" am:
c4c4a1e76e am:
f897e1c3b6
am:
2b5a0d299d
Change-Id: I845657a3c8f14f38f0c3b490d16677620ba0bcc4
Yi Kong [Mon, 29 Aug 2016 08:09:52 +0000 (08:09 +0000)]
Merge "Track getxattr API change" am:
c4c4a1e76e
am:
f897e1c3b6
Change-Id: I47ac9cfbd5a38849dad542089cb3fa923a8cd3fe
Yi Kong [Mon, 29 Aug 2016 08:05:05 +0000 (08:05 +0000)]
Merge "Track getxattr API change"
am:
c4c4a1e76e
Change-Id: I66059536d5dfb0999743656f095d557ddf25ff70
Treehugger Robot [Mon, 29 Aug 2016 07:57:29 +0000 (07:57 +0000)]
Merge "Track getxattr API change"
Felipe Leme [Sun, 28 Aug 2016 22:42:37 +0000 (22:42 +0000)]
Removed screen on/off callbacks from NPMS. am:
b79f06a476 am:
a4defc17c7
am:
2c6a1fb0e1
Change-Id: I33792d30ba97be1b4244619c4a73f95352e2776f
Felipe Leme [Sun, 28 Aug 2016 22:33:42 +0000 (22:33 +0000)]
Removed screen on/off callbacks from NPMS. am:
b79f06a476
am:
a4defc17c7
Change-Id: I044cb8bba3fba37cd8bb29961feeab3e279f9e08
Felipe Leme [Sun, 28 Aug 2016 22:27:12 +0000 (22:27 +0000)]
Removed screen on/off callbacks from NPMS.
am:
b79f06a476
Change-Id: If17367db296e3f8c90dddd9dce445a7068320a14
Felipe Leme [Wed, 10 Aug 2016 20:00:32 +0000 (13:00 -0700)]
Removed screen on/off callbacks from NPMS.
NetworkPolicyManagerService (NPMS) used to depend on screen on/off
changes to determine if a foreground activity should have network
restrictions, but such check is now redundant since ActivityManager
already changes the proper UID state (like going from TOP to
TOP_SLEEPING) when the screen status is changed.
Removing such code decreases the NPMS lock contention when the screen is
turned on in about 3-5ms.
Change-Id: I2853443efedbf14961ae9a5b2e72689d4d1a646c
BUG:
30785671
(cherry picked from commit
88f40ad9a721ee30708be82f66fb58c64f1d36b5)
(cherry picked from commit
f8dd7b4e8d548274c680644a2225951b97e94a4f)
Yi Kong [Sat, 27 Aug 2016 11:16:44 +0000 (12:16 +0100)]
Track getxattr API change
Bug:
30992227
Change-Id: I788b3e51a536c7df7896f622038fe762f9848a2a
Jorim Jaggi [Sat, 27 Aug 2016 01:48:43 +0000 (01:48 +0000)]
Merge "Fix invalid divider state while rotating" into nyc-mr1-dev am:
a2316b3041
am:
9cb567c9ad
Change-Id: I3f84a9bccc4b62e33361a8f6b55b065534d6943c
Jorim Jaggi [Sat, 27 Aug 2016 01:48:34 +0000 (01:48 +0000)]
Fix invalid divider state while rotating am:
160a3c578c
am:
4472858029
Change-Id: Ia669727e19aa6e036f333be281b5fd125596ae17
Jorim Jaggi [Sat, 27 Aug 2016 01:42:06 +0000 (01:42 +0000)]
Merge "Fix invalid divider state while rotating" into nyc-mr1-dev
am:
a2316b3041
Change-Id: Iacaaae092285b09290a99a009a86b81434031dae
Jorim Jaggi [Sat, 27 Aug 2016 01:42:04 +0000 (01:42 +0000)]
Fix invalid divider state while rotating
am:
160a3c578c
Change-Id: I9ddd0ea9b17b1efa30db044dc1a822980d3dcfab
TreeHugger Robot [Sat, 27 Aug 2016 01:37:06 +0000 (01:37 +0000)]
Merge "Fix invalid divider state while rotating" into nyc-mr1-dev
Daniel Chapin [Sat, 27 Aug 2016 01:31:11 +0000 (01:31 +0000)]
Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev am:
7c02d7adaa am:
26aec7300d
am:
38fef6a38b
Change-Id: I6dad8e894122913f82ad84bdf3619b896451d088
Adam Powell [Sat, 27 Aug 2016 01:31:07 +0000 (01:31 +0000)]
Fixes for ImageView drawable visibility dispatch am:
06f9eb8b62 am:
fd86f7fdfd
am:
ee2f4d890e
Change-Id: I8cb5a6e2ffc7a62cf6fe68176482cdaefc596ecc
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
Chih-Hung Hsieh [Sat, 27 Aug 2016 00:08:36 +0000 (00:08 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am:
e2732e5e38 am:
e33f3472f3
am:
007c463e64
Change-Id: Idb404e8f99289a1492d7d3f1af938cf5c0f1c7f0
Chih-Hung Hsieh [Sat, 27 Aug 2016 00:01:59 +0000 (00:01 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests." am:
e2732e5e38
am:
e33f3472f3
Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b
Chih-Hung Hsieh [Fri, 26 Aug 2016 23:53:25 +0000 (23:53 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests."
am:
e2732e5e38
Change-Id: If801b6f30a280ed8382c37765e2623eb3520ebcc
Treehugger Robot [Fri, 26 Aug 2016 23:45:07 +0000 (23:45 +0000)]
Merge "Fix misc-macro-parentheses warnings in hwui/tests."
Chong Zhang [Fri, 26 Aug 2016 23:40:08 +0000 (23:40 +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
am:
233b85b79b
Change-Id: I26f4a6df9a3ae32c26d87d81b54239411572f8a8
Chong Zhang [Fri, 26 Aug 2016 23:40:04 +0000 (23:40 +0000)]
DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am:
813be138ae am:
9f92bc2602
am:
8673e303a7
Change-Id: I34d205de8f368df05e068548a69448da397d2e41
Jorim Jaggi [Thu, 25 Aug 2016 22:57:41 +0000 (15:57 -0700)]
Fix invalid divider state while rotating
- Sometimes there is no window attached to the app token during a
rotation. In this case, we also want to return a valid dock side, so
we check for hiddenRequested instead of traversing the windows
of an app window token.
- The logic to notify SystemUI about rotation changes never really
worked. Remove the dock side check as the dock side is guaranteed
to change if we change the screen rotation
- Also clean up visibility methods a bit.
Test: Manually tested the interaction when in docked state landscape,
and going home with locked home rotation like 20 times. Also tested
multi-user interaction with docking.
Change-Id: Ibcd181cadc9bc5a97dbd20e67d15bb1c88de5b97
Fixes:
29569499
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:52:55 +0000 (22:52 +0000)]
Enable web action apps based on system setting am:
efc1c4d501
am:
742f4de6cf
Change-Id: I86aef56f2cf9caf8a7e5b54e78a3ec7de855c796
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)
Chih-Hung Hsieh [Fri, 26 Aug 2016 22:19:47 +0000 (15:19 -0700)]
Fix misc-macro-parentheses warnings in hwui/tests.
* Add parentheses around macro parameters.
Bug:
28705665
Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
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
Android Build Merger (Role) [Fri, 26 Aug 2016 20:46:07 +0000 (20:46 +0000)]
Merge changes from topic 'am-
51f46b0037de4a44a6855ff5a0be6dfa' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am:
020212c7df am:
ffe4d64182
Add device config to determine when "allow hold" carrier config is used. am:
d81c426e1d am:
6c619a2abb
Merge "Implement new ephemeral resolver design" into nyc-mr1-dev am:
80855e154e am:
2265267555
Implement new ephemeral resolver design am:
fea1b776e9 am:
6485f6eddf
Tyler Gunn [Fri, 26 Aug 2016 20:44:17 +0000 (20:44 +0000)]
Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am:
020212c7df
am:
ffe4d64182
Change-Id: I5a6e5f69728ae04ad3d7dc5c5218f8db318bc41c
Tyler Gunn [Fri, 26 Aug 2016 20:43:34 +0000 (20:43 +0000)]
Add device config to determine when "allow hold" carrier config is used. am:
d81c426e1d
am:
6c619a2abb
Change-Id: I313263a906ec503899710f0d672dbfa76550cb51
Todd Kennedy [Fri, 26 Aug 2016 20:43:29 +0000 (20:43 +0000)]
Merge "Implement new ephemeral resolver design" into nyc-mr1-dev am:
80855e154e
am:
2265267555
Change-Id: I524d2e6be9363989d5ab78be1acf609d415b42f7
Todd Kennedy [Fri, 26 Aug 2016 20:43:26 +0000 (20:43 +0000)]
Implement new ephemeral resolver design am:
fea1b776e9
am:
6485f6eddf
Change-Id: I2bca8e38da973a0a1e7d5d11b5d094dc0188cc40
Colin Cross [Fri, 26 Aug 2016 20:40:27 +0000 (20:40 +0000)]
Merge "Replace libziparchive-host with libziparchive" am:
611e205bbe am:
8c8bb25089
am:
63dc310e6a
Change-Id: I645d077dd656f84446f77fd91c169fd7b977e661
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
Colin Cross [Fri, 26 Aug 2016 20:32:24 +0000 (20:32 +0000)]
Merge "Replace libziparchive-host with libziparchive" am:
611e205bbe
am:
8c8bb25089
Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb
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
Colin Cross [Fri, 26 Aug 2016 20:25:13 +0000 (20:25 +0000)]
Merge "Replace libziparchive-host with libziparchive"
am:
611e205bbe
Change-Id: I077a18bc3e6de20e0d4d6d6213de829ea47ffe43
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
Colin Cross [Fri, 26 Aug 2016 20:18:54 +0000 (20:18 +0000)]
Merge "Replace libziparchive-host with libziparchive"
Jorim Jaggi [Fri, 26 Aug 2016 19:52:09 +0000 (19:52 +0000)]
Play sound on ACTION_DOWN for navigation keys am:
05bce15da9
am:
9bdfbd7c82
Change-Id: Ic36e668f7b5daf6909681f2a671b336667783968
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:33:15 +0000 (18:33 +0000)]
Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am:
73f511e471
am:
3a41c5b654
Change-Id: I79c4ddea4969d7c187424e15b2ce22027f100ca3
Greg Kaiser [Fri, 26 Aug 2016 18:33:11 +0000 (18:33 +0000)]
ContextHubManager: Document InstanceInfo bug am:
3be73d3950
am:
6f155aa4bf
Change-Id: If551002c7b93c9176b46e7ba10f9c0691291d69f
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
Colin Cross [Fri, 26 Aug 2016 18:15:17 +0000 (11:15 -0700)]
Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.
Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd
Paul Stewart [Fri, 26 Aug 2016 18:01:57 +0000 (18:01 +0000)]
Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am:
855210170c
am:
1377955965
Change-Id: Iaa21fa2b825a60125471e4764d2dde3e397cfea1
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: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: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
OSDN Git Service
