OSDN Git Service
fionaxu [Thu, 9 Jun 2016 02:39:54 +0000 (02:39 +0000)]
Merge \"resolve merge conflicts of
afed6f8 to nyc-dev\" into nyc-dev
am:
0c4f1c7e5c
Change-Id: I46be8494c88f03768e20bb702383f78cf38c1115
sreevanis [Thu, 9 Jun 2016 02:35:55 +0000 (02:35 +0000)]
Merge \\\"docs: Documented how to handle alarms in AA media apps.\\\" into mnc-io-docs am:
21d6abf7be am:
539b6b7580
am:
e8ebd8aea0
Change-Id: I76ce0cb5254c571dd591dcb7547380fbd5fe8437
Chen Xu [Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)]
Merge "resolve merge conflicts of
afed6f8 to nyc-dev" into nyc-dev
Sreevani Sreejith [Thu, 9 Jun 2016 02:28:58 +0000 (02:28 +0000)]
Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am:
21d6abf7be
am:
539b6b7580
Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd
sreevanis [Thu, 9 Jun 2016 02:23:30 +0000 (02:23 +0000)]
Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am:
21d6abf7be
Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b
Sreevani Sreejith [Thu, 9 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs
sreevanis [Fri, 3 Jun 2016 19:43:52 +0000 (12:43 -0700)]
docs: Documented how to handle alarms in AA media apps.
Bug:
27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224
Jim Miller [Thu, 9 Jun 2016 01:41:36 +0000 (01:41 +0000)]
Merge \"Always re-enable keyguard state when the user switches.\" into nyc-dev
am:
9e94c455f8
Change-Id: If2ebbeba6060fde2bb34e81f54bccdaa82430f6e
TreeHugger Robot [Thu, 9 Jun 2016 01:38:31 +0000 (01:38 +0000)]
Merge "Always re-enable keyguard state when the user switches." into nyc-dev
Jim Miller [Thu, 9 Jun 2016 00:34:36 +0000 (00:34 +0000)]
Merge \"Revert \"Temporarily increase timeout for devices with buggy driver\"\" into nyc-dev
am:
e36da9c8c9
Change-Id: I893b0a87751dcd7f4f5e7688a23e3604dd7a4534
TreeHugger Robot [Thu, 9 Jun 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev
Winson [Thu, 9 Jun 2016 00:27:07 +0000 (00:27 +0000)]
Forcing software in header button background ripples.
am:
18227e4831
Change-Id: Id257602161261fd73b08c0899648486c5bb33a66
fionaxu [Wed, 8 Jun 2016 23:05:56 +0000 (16:05 -0700)]
resolve merge conflicts of
afed6f8 to nyc-dev
Bug:
28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
Danny Epstein [Thu, 9 Jun 2016 00:22:29 +0000 (00:22 +0000)]
Merge "Reduce padding and font sizes for watch preferences. - Reduce icon size and padding. - Reduce widget padding. - Reduce font size of styles used in preferences." into nyc-mr1-dev
Winson [Wed, 8 Jun 2016 19:57:40 +0000 (12:57 -0700)]
Forcing software in header button background ripples.
Bug:
29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476
Yuchao Zhou [Wed, 8 Jun 2016 23:27:56 +0000 (23:27 +0000)]
Merge "Update enable/disable code to reduce flakiness" into nyc-mr1-dev
Adam Lesinski [Wed, 8 Jun 2016 22:55:39 +0000 (22:55 +0000)]
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am:
e5417a3863
Change-Id: I6188a7261443e192fb355033f7ff1cc01ea47c33
George Mount [Wed, 8 Jun 2016 22:52:03 +0000 (22:52 +0000)]
Merge "Fix NPE in startup wizard caused by former change." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 22:49:23 +0000 (22:49 +0000)]
Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev
Danny Epstein [Thu, 2 Jun 2016 18:56:35 +0000 (11:56 -0700)]
Reduce padding and font sizes for watch preferences.
- Reduce icon size and padding.
- Reduce widget padding.
- Reduce font size of styles used in preferences.
BUG:
27779149
Change-Id: I9aa96b35dee54d3036c7fc83139a36bf383eb6ce
George Mount [Wed, 8 Jun 2016 22:13:52 +0000 (15:13 -0700)]
Fix NPE in startup wizard caused by former change.
Bug
29211438
Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
Svet Ganov [Wed, 8 Jun 2016 21:59:02 +0000 (21:59 +0000)]
Merge \"Teach persistable Uri grants about direct boot\" into nyc-dev
am:
7014eef54a
Change-Id: I5096120ecd7c2959724e7e16f6d0a0c3712c18fa
Svetoslav Ganov [Wed, 8 Jun 2016 21:54:39 +0000 (21:54 +0000)]
Merge "Teach persistable Uri grants about direct boot" into nyc-dev
Adarsh Fernando [Wed, 8 Jun 2016 21:21:37 +0000 (21:21 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071 am:
28f355bb63
am:
fe089e3dc5
Change-Id: I2d6f36df9319c52ac64ac32621bd1061815a3bdc
Adam Lesinski [Wed, 8 Jun 2016 21:19:09 +0000 (14:19 -0700)]
Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.
Bug:
29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
Adarsh Fernando [Wed, 8 Jun 2016 21:18:02 +0000 (21:18 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071
am:
28f355bb63
Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37
Yuchao Zhou [Wed, 8 Jun 2016 17:07:39 +0000 (10:07 -0700)]
Update enable/disable code to reduce flakiness
Change-Id: I9d3f69ca583b365bb5f89cfe16adcd6e604614c6
Adarsh Fernando [Wed, 8 Jun 2016 21:12:56 +0000 (21:12 +0000)]
AS UI redirect for experimental to stable Gradle migration guide
am:
c65f7e8071
Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c
Christopher Wiley [Wed, 8 Jun 2016 20:55:10 +0000 (20:55 +0000)]
Merge "Create frameworks-base-testutils lib" into nyc-mr1-dev
Christopher Wiley [Wed, 8 Jun 2016 20:55:10 +0000 (20:55 +0000)]
Merge changes from topic 'tethering-ownership' into nyc-mr1-dev
* changes:
Tethering: Own WiFi tethering state and lifetime
Use an ArrayMap instead of HashMap to track tether interfaces
Consolidate cleanup logic in TetherInterfaceSM.TetheredState
Annotate TetherInterfaceStateMachineTest for APCT
Rely on Tethering mutex for TetherInterfaceSM
Rename TetherInterfaceSM to TetherInterfaceStateMachine
Remove dead code from TetherInterfaceSM
Remove transient StartingState from TetherInterfaceSM
Expand test coverage of TetherInterfaceSM
Add demonstration unittest for TetherInterfaceSM
Extract TetherInterfaceSM to its own class.
Make Tethering.TetherInterfaceSM more self contained
Clean up class members in Tethering.TetherInterfaceSM
Fix trivial warnings in Tethering.java
Adarsh Fernando [Wed, 8 Jun 2016 20:42:37 +0000 (13:42 -0700)]
AS UI redirect for experimental to stable Gradle migration guide
- This guide may be moved over to DAC when AS 2.2 goes stable.
Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e
Robert Carr [Wed, 8 Jun 2016 20:28:17 +0000 (20:28 +0000)]
Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev
am:
3207d8f8a1
Change-Id: Id17634723fd1fce94cd62f29322a23c5f67dda89
Selim Cinek [Wed, 8 Jun 2016 20:28:12 +0000 (20:28 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
am:
b99e19c729
Change-Id: Ied2e9dd7c4b3cd474f00018401e49f061a43a4cf
Jason Monk [Wed, 8 Jun 2016 20:28:08 +0000 (20:28 +0000)]
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
am:
bbcb733d80
Change-Id: I048576c6a65ac4ca884dbca131b050dc8599ae3f
Jason Monk [Wed, 8 Jun 2016 20:28:06 +0000 (20:28 +0000)]
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
am:
fd6e7e6790
Change-Id: Ic648b5e22c18337cb1e71c93adfb78dcc9707bac
Jason Monk [Wed, 8 Jun 2016 20:28:04 +0000 (20:28 +0000)]
Merge \"QS: Show date even on small screens\" into nyc-dev
am:
883da638e2
Change-Id: I4bc7594fa5004c8d58933d9432a70353474f07e4
Adrian Roos [Wed, 8 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge "Direct Reply: Add back emoji button" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 20:24:16 +0000 (16:24 -0400)]
resolve merge conflicts of
fbf366d to nyc-mr1-dev
Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42
TreeHugger Robot [Wed, 8 Jun 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
Adrian Roos [Fri, 3 Jun 2016 15:50:23 +0000 (08:50 -0700)]
Direct Reply: Add back emoji button
Bug:
29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
Will Harmon [Wed, 8 Jun 2016 20:20:57 +0000 (20:20 +0000)]
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am:
4455fc734c
Change-Id: I3f5e4eb86d8a14393a853669a401090046a31da3
Jason Monk [Wed, 8 Jun 2016 20:20:52 +0000 (20:20 +0000)]
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am:
27eadb6f1d
Change-Id: Iaf1558df689ba4ea033b081ba1c24b5d45d7e36c
Alan Viverette [Wed, 8 Jun 2016 20:20:44 +0000 (20:20 +0000)]
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am:
afaa1e9db1
Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
Julia Reynolds [Wed, 8 Jun 2016 20:20:43 +0000 (20:20 +0000)]
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am:
e1451c4e30
Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481
Felipe Leme [Wed, 8 Jun 2016 20:20:41 +0000 (20:20 +0000)]
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am:
fb5995cfbb
Change-Id: I5f649b54038b586be375394d35fd34453213df0a
TreeHugger Robot [Wed, 8 Jun 2016 20:08:37 +0000 (20:08 +0000)]
Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 20:03:50 +0000 (20:03 +0000)]
Merge "resolve merge conflicts of
718f321 to nyc-mr1-dev" into nyc-mr1-dev
Wei Wang [Wed, 8 Jun 2016 19:53:24 +0000 (19:53 +0000)]
Merge "Add launch power hint for activity launch end" into nyc-mr1-dev
Svet Ganov [Wed, 8 Jun 2016 16:40:47 +0000 (09:40 -0700)]
Teach persistable Uri grants about direct boot
We read the persistable Uri grants on boot at which point
the user is not unlocked. This results in ignoring Uri
grants for boot unaware content providers.
This change reads all persisted Uri grants on boot but
filters them out during query based on the current user
unlock state.
bug:
29058113
Change-Id: I2643fc098f42359e72a4c534236debc9b9389256
Selim Cinek [Wed, 8 Jun 2016 19:37:39 +0000 (19:37 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
Jason Monk [Wed, 8 Jun 2016 19:12:19 +0000 (19:12 +0000)]
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "QS: Fix leak in QSAnimator" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:40 +0000 (19:11 +0000)]
Merge "QS: Show date even on small screens" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev
Will Harmon [Mon, 6 Jun 2016 19:54:59 +0000 (12:54 -0700)]
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
Fixes:
28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Settings: Better handling for disabled tiles" into nyc-dev
Amith Yamasani [Wed, 8 Jun 2016 18:40:55 +0000 (11:40 -0700)]
resolve merge conflicts of
718f321 to nyc-mr1-dev
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
Ian Pedowitz [Wed, 8 Jun 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Return correct default theme on API >= 24" into nyc-dev
fionaxu [Wed, 8 Jun 2016 18:24:16 +0000 (18:24 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717 am:
c95d552de0
am:
c10e4fae05
Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee
Julia Reynolds [Wed, 8 Jun 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Handle alarm firing outside of DND period." into nyc-dev
fionaxu [Wed, 8 Jun 2016 18:11:09 +0000 (18:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717
am:
c95d552de0
Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
Tianjie Xu [Wed, 8 Jun 2016 18:04:32 +0000 (18:04 +0000)]
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am:
00681d0e78
Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
TreeHugger Robot [Wed, 8 Jun 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Wrap closeQuietly() on finally block." into nyc-dev
Amith Yamasani [Wed, 8 Jun 2016 17:55:39 +0000 (17:55 +0000)]
Merge "Add a separate read permission for oem unlock state" into nyc-dev
Tianjie Xu [Wed, 8 Jun 2016 17:25:15 +0000 (17:25 +0000)]
Merge "Change unit of I/O statistics to MiB" into nyc-dev
fionaxu [Wed, 8 Jun 2016 17:23:27 +0000 (17:23 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c
am:
698e044717
Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
Sudheer Shanka [Wed, 8 Jun 2016 17:15:03 +0000 (17:15 +0000)]
Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev
fionaxu [Wed, 8 Jun 2016 17:11:49 +0000 (17:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e
am:
965084dd0c
Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
fionaxu [Wed, 8 Jun 2016 17:04:09 +0000 (17:04 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e
am:
1e8fe12f4e
Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
Makoto Onuki [Wed, 8 Jun 2016 16:59:59 +0000 (16:59 +0000)]
Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev
fionaxu [Wed, 8 Jun 2016 16:58:13 +0000 (16:58 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev
am:
c196526f8e
Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9
Daniel Yu [Wed, 8 Jun 2016 16:34:09 +0000 (16:34 +0000)]
Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev
am:
22dec763a3
Change-Id: Ia70ede8a50300cebba25263976dd350ccc9b30de
Dan Yu [Wed, 8 Jun 2016 16:22:26 +0000 (16:22 +0000)]
Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev
Makoto Onuki [Wed, 8 Jun 2016 16:16:39 +0000 (16:16 +0000)]
Merge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev
Felipe Leme [Wed, 8 Jun 2016 16:12:37 +0000 (09:12 -0700)]
Wrap closeQuietly() on finally block.
BUG:
29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
Alan Viverette [Wed, 8 Jun 2016 15:45:15 +0000 (11:45 -0400)]
Return correct default theme on API >= 24
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.
Bug:
29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
Ricky Wai [Wed, 8 Jun 2016 14:46:47 +0000 (14:46 +0000)]
Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev
am:
18c8690b7e
Change-Id: I8daa485fcf810c5c5bb40903216f8b989658b5ca
Jeremy Joslin [Wed, 8 Jun 2016 14:39:09 +0000 (14:39 +0000)]
Merge \"Fix #
29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev
am:
464f7e4983
Change-Id: I40be62c7cb0c5802e9cfa3eb913c899c77d3df0e
Ricky Wai [Wed, 8 Jun 2016 14:33:55 +0000 (14:33 +0000)]
Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 14:32:42 +0000 (14:32 +0000)]
Merge "Fix #
29073394: Need to bind to scorer after user is unlocked." into nyc-dev
George Mount [Wed, 8 Jun 2016 14:13:37 +0000 (07:13 -0700)]
Re-add Internal API for cross-task Activity used by assistant.
Bug:
29091742
This reverts commit
563df3b328f5488aaa33b894748029ed00d0e263.
This also fixes the problems experienced by b/
29128683.
Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11
Baligh Uddin [Wed, 8 Jun 2016 13:21:51 +0000 (13:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
002ccec5c1 -s ours
Change-Id: I1d774f175bfff7e90b9253fe84222964f5d97677
Baligh Uddin [Wed, 8 Jun 2016 13:10:46 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
e573989e05 -s ours
Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c
Baligh Uddin [Wed, 8 Jun 2016 13:10:44 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
c20ea2eb43 -s ours
Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4
Baligh Uddin [Wed, 8 Jun 2016 13:10:41 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
64d6fddc4b -s ours
Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17
Baligh Uddin [Wed, 8 Jun 2016 13:10:38 +0000 (13:10 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
2d3c74a2fd -s ours
Change-Id: I44308cc36bf4f3dde8fe34cd0e225914fa3d602d
Baligh Uddin [Wed, 8 Jun 2016 13:09:24 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Tue, 7 Jun 2016 18:01:32 +0000 (14:01 -0400)]
Settings: Better handling for disabled tiles
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.
Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes:
29080209
Baligh Uddin [Wed, 8 Jun 2016 13:05:46 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:38 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:05:36 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Tue, 7 Jun 2016 20:06:59 +0000 (16:06 -0400)]
QS: Fix leak in QSAnimator
Change-Id: I54f1e083cf6ba6bfb5abc0f416680cbda1401980
Fixes:
29113833
Robin Lee [Wed, 8 Jun 2016 10:50:42 +0000 (10:50 +0000)]
Merge \"Package changed/removed listeners for always-on VPN\" into nyc-dev
am:
ee5e4cc836
Change-Id: I8f7054b5a2ac69677a0e124e9a616b3d58b604af
TreeHugger Robot [Wed, 8 Jun 2016 10:46:41 +0000 (10:46 +0000)]
Merge "Package changed/removed listeners for always-on VPN" into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 06:35:31 +0000 (06:35 +0000)]
Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
* changes:
Give WakeupMessage the ability to transport an object as well.
Don't treat the lingerExpired broadcast specially.
Add a test for mobile data always on.
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well.
Bug:
23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
Lorenzo Colitti [Sun, 5 Jun 2016 14:45:25 +0000 (23:45 +0900)]
Don't treat the lingerExpired broadcast specially.
NetworkMonitor no longer uses the broadcast for lingering, it
uses WakeupMessage instead.
Bug:
23113288
Change-Id: Idb0c55fc68cb8f45b3213c7134213904f227852e
Lorenzo Colitti [Sun, 5 Jun 2016 12:00:23 +0000 (21:00 +0900)]
Add a test for mobile data always on.
Bug:
23113288
Change-Id: Ia8649061a797367d135bb5576600a7cdc85a822e
Lorenzo Colitti [Sat, 4 Jun 2016 17:20:29 +0000 (02:20 +0900)]
Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
This class makes it easier to test code that uses Settings:
1. Real device or emulator settings don't affect the code under
test; all settings always start off empty.
2. It's possible to change settings from the test without
affecting system settings.
3. No changes are needed to the code under test. The changes to
the tests are simple: just add a fake ContentResolver to
whatever mock Context is already used by the test, and make
that ContentResolver use the fake provider.
Bug:
23113288
Change-Id: I5e7e5a87571444ae49ccf551705620675a36cd17