OSDN Git Service
Jason Monk [Mon, 29 Aug 2016 18:43:19 +0000 (18:43 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10 am:
db2d30e1b9
am:
1a5a746fa3
Change-Id: I6c3c1fc27c3f851b27d6036225a8c410b9972517
Jason Monk [Mon, 29 Aug 2016 18:43:17 +0000 (18:43 +0000)]
Fix double status bar icons am:
12124d7eca am:
447991c67a
am:
9570287870
Change-Id: I29d3319ab271e1dd42f7af15f917f97619972cd5
Selim Cinek [Mon, 29 Aug 2016 18:43:14 +0000 (18:43 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e am:
c9c0bcf6a9
am:
df8c802677
Change-Id: I3596b2d9182a967896b122c653b5a42c713838aa
Selim Cinek [Mon, 29 Aug 2016 18:43:11 +0000 (18:43 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3 am:
e90d6d682e
am:
ed596e6836
Change-Id: I430e38bcba8b741fe2b43c5dba6f1d2a3f38d5a0
Selim Cinek [Mon, 29 Aug 2016 18:43:07 +0000 (18:43 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0 am:
c52edb4f24
am:
b35ae808c0
Change-Id: If4057d8e392d19ba62f9365788628922b02d9173
Vineeta Srivastava [Mon, 29 Aug 2016 18:34:03 +0000 (18:34 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am:
24b0486cdc
am:
dd51fb20f3
Change-Id: I1189b69e2b38f36c805198e9dba105df4364f9e8
Vineeta Srivastava [Mon, 29 Aug 2016 18:33:56 +0000 (18:33 +0000)]
whitelist sms code for TMO-DE and TMO-MK. am:
6af315af94
am:
f4be3d2927
Change-Id: I75b17dff3fa7b255adb7ce7d705a2d65c1ad5347
Jason Monk [Mon, 29 Aug 2016 18:32:39 +0000 (18:32 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10
am:
db2d30e1b9
Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb
Jason Monk [Mon, 29 Aug 2016 18:32:37 +0000 (18:32 +0000)]
Fix double status bar icons am:
12124d7eca
am:
447991c67a
Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad
Selim Cinek [Mon, 29 Aug 2016 18:32:35 +0000 (18:32 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev am:
4226dcef1e
am:
c9c0bcf6a9
Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429
Selim Cinek [Mon, 29 Aug 2016 18:32:33 +0000 (18:32 +0000)]
Fixed a bug where notifications could reappear am:
f3b64692a3
am:
e90d6d682e
Change-Id: Ie08bd37033cd81ff0898a6766bd505e0f597d7fe
Selim Cinek [Mon, 29 Aug 2016 18:32:31 +0000 (18:32 +0000)]
Fixed a bug where the headsup would be stuck disappearing am:
a4155bb7c0
am:
c52edb4f24
Change-Id: I94084878dec7952607572d3005a160cc74eb2a62
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:02 +0000 (18:26 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
am:
24b0486cdc
Change-Id: Id291ae046845660231be5b42473ef9b839055035
Vineeta Srivastava [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
whitelist sms code for TMO-DE and TMO-MK.
am:
6af315af94
Change-Id: Ib31807ae28fa798e6d359054d70f9adeaf2872a4
Jason Monk [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]
Merge "Fix double status bar icons" into nyc-dev
am:
2b4e612b10
Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f
Jason Monk [Mon, 29 Aug 2016 18:25:57 +0000 (18:25 +0000)]
Fix double status bar icons
am:
12124d7eca
Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8
Selim Cinek [Mon, 29 Aug 2016 18:25:54 +0000 (18:25 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
am:
4226dcef1e
Change-Id: I7c3c46bf360899387a0d2d33d4beb83a3b096aa0
Selim Cinek [Mon, 29 Aug 2016 18:25:51 +0000 (18:25 +0000)]
Fixed a bug where notifications could reappear
am:
f3b64692a3
Change-Id: I19719fc6112e82d9600b4196570f571f87291530
Selim Cinek [Mon, 29 Aug 2016 18:25:47 +0000 (18:25 +0000)]
Fixed a bug where the headsup would be stuck disappearing
am:
a4155bb7c0
Change-Id: Ic82cbac42cf17427ca5d6675a63d6f914a87f6cb
Vineeta Srivastava [Mon, 29 Aug 2016 18:18:13 +0000 (18:18 +0000)]
Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Merge "Fix double status bar icons" into nyc-dev
Greg Kaiser [Mon, 29 Aug 2016 17:59:30 +0000 (17:59 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
am:
40e6194148
Change-Id: Idcb9f7a4f621f9dc2c66204ef9bd31b9a0649be0
Greg Kaiser [Mon, 29 Aug 2016 17:59:28 +0000 (17:59 +0000)]
ContextHubService: Allow cancelling load/unload
am:
29e868071d
Change-Id: I6c3b5130972907fae1849e596aec8c37ed47e65b
Greg Kaiser [Mon, 29 Aug 2016 17:59:25 +0000 (17:59 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
am:
143aaa6d05
Change-Id: I9104870e67e6fe86f294be831575a8c79549fd45
Greg Kaiser [Mon, 29 Aug 2016 17:59:23 +0000 (17:59 +0000)]
ContextHubService: Hack in Google vendor value
am:
5817ce0c13
Change-Id: I168a2a2a50168f7590842b5c51fbc8a80842b00e
Amith Yamasani [Mon, 29 Aug 2016 17:59:21 +0000 (17:59 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev
am:
81f876e795
Change-Id: I42aac53add1740ee2253821099da7f9dc45f57d2
Amith Yamasani [Mon, 29 Aug 2016 17:59:19 +0000 (17:59 +0000)]
Add logging to CursorWindow JNI code to track #
31046363
am:
0903ec5017
Change-Id: Idde495c1662be20d20a907521ae4e0dbaf5ad88c
Pablo Ceballos [Mon, 29 Aug 2016 17:59:16 +0000 (17:59 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
am:
23784fd6d9
Change-Id: Id5eb1742d13fda9ac1d8a1354e4dacd458f2949c
Pablo Ceballos [Mon, 29 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Fail createVirtualDisplay with single-buffered Surface
am:
aff2f94939
Change-Id: I5cfcbd0352240d7ac2a9bb0804896cae5396450e
TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev
Greg Kaiser [Mon, 29 Aug 2016 17:48:45 +0000 (17:48 +0000)]
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
Greg Kaiser [Mon, 29 Aug 2016 17:43:29 +0000 (17:43 +0000)]
Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
Amith Yamasani [Mon, 29 Aug 2016 17:42:37 +0000 (17:42 +0000)]
Merge "Add logging to CursorWindow JNI code to track #
31046363" into nyc-mr1-dev
Pablo Ceballos [Mon, 29 Aug 2016 17:41:57 +0000 (17:41 +0000)]
Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
Greg Kaiser [Fri, 26 Aug 2016 06:04:08 +0000 (23:04 -0700)]
ContextHubService: Allow cancelling load/unload
As a minimal risk improvement for Android N, we allow a new
load/unload transaction request to cancel a currently pending
one if enough time has passed since starting the current
transaction.
Bug:
30111539
Change-Id: Ide958c2454b88529305443fb789b8ae5af18c642
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
(cherry picked from commit
c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)
Narayan Kamath [Mon, 29 Aug 2016 11:43:01 +0000 (11:43 +0000)]
Fix clang build breakage (-Werror -Wformat).
am:
b334c33d65
Change-Id: I36f6e388d8294d5650c2bcc1ab2eaec81e09a263
Narayan Kamath [Mon, 29 Aug 2016 11:31:41 +0000 (12:31 +0100)]
Fix clang build breakage (-Werror -Wformat).
Use %zd for size_t. Note that this will break only on (-plus-)aosp because
clang is disabled on the N development branches.
bug:
30963384
Change-Id: I4b5ba7caf15bc2ebf5bb3395d82170ec786ed50c
Narayan Kamath [Mon, 29 Aug 2016 10:42:24 +0000 (10:42 +0000)]
Reopen whitelisted zygote file descriptors after a fork.
am:
c5f27a7cb2
Change-Id: If8294753c0c78620cde80a76389022684110ddd0
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Change-Id: Icfd45c96c660491b554d146a9d70d97dbcc712bc
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)
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: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
Selim Cinek [Wed, 20 Jul 2016 20:46:49 +0000 (13:46 -0700)]
Fixed a bug where notifications could reappear
With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.
This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.
Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes:
30056258
(cherry picked from commit
9e624e732aa5646c83d203587be9c2c4e94c9266)
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes:
30120962
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
Amith Yamasani [Fri, 26 Aug 2016 16:22:36 +0000 (09:22 -0700)]
Add logging to CursorWindow JNI code to track #
31046363
Log the error messages when trying to mmap the remote
cursor's ashmem file descriptor.
Bug:
31046363
Change-Id: I52839d1246f84a0a2d7b1e850933fcdf6056b884
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)
Vineeta Srivastava [Fri, 26 Aug 2016 21:10:54 +0000 (14:10 -0700)]
whitelist sms code for TMO-DE and TMO-MK.
For Germany (T-D) 73240 and 3011 is added to whitelist
For Macedonia (TMMK) 129005 and 122 added to whitelist
Bug:
30908153
Change-Id: I892a172994de62d90df313e9f7aaa17356092448
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