OSDN Git Service
Bill Yi [Wed, 26 Oct 2016 23:33:47 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia2d8f54a16000eea7175a78c25eb06cec1ad3dd4
Auto-generated-cl: translation import
Julius D'souza [Wed, 26 Oct 2016 03:29:49 +0000 (03:29 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
am:
1e0055bb51
Change-Id: If6b70c76c4e16634175667ca58b69077c5e54c61
Julius D'souza [Wed, 26 Oct 2016 03:29:41 +0000 (03:29 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate
am:
82b9aff0a9
Change-Id: I65408c700317d76e271659945fe280318dabe315
Julius D'souza [Wed, 26 Oct 2016 03:23:17 +0000 (03:23 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
Julius D'souza [Tue, 25 Oct 2016 02:26:45 +0000 (19:26 -0700)]
DO NOT MERGE: Add initial ambient light sensor rate
Bug:
32153559
Change-Id: Ic54bded46f88991290ed1e4d2574f865b6f598ec
Jorim Jaggi [Tue, 25 Oct 2016 23:48:15 +0000 (23:48 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295
am:
66a7dc6193
Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c
Jorim Jaggi [Tue, 25 Oct 2016 23:47:20 +0000 (23:47 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88
am:
1d4f2b9914
Change-Id: I27ef32dfb5963524c0c3efb03058f021799dda07
Jorim Jaggi [Tue, 25 Oct 2016 23:39:30 +0000 (23:39 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
am:
7e8fc05295
Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11
Jorim Jaggi [Tue, 25 Oct 2016 23:39:25 +0000 (23:39 +0000)]
Make sure to call dismissKeyguard after setOccluded
am:
ec50931d88
Change-Id: Ib25480fa4efe63940fed144f4e28dee185244fad
Jorim Jaggi [Tue, 25 Oct 2016 23:32:54 +0000 (23:32 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
Adrian Roos [Tue, 25 Oct 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours
am:
299b57410d -s ours
Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185
Adrian Roos [Tue, 25 Oct 2016 22:10:46 +0000 (22:10 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours
am:
4e2bad2a02 -s ours
Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8
Adrian Roos [Tue, 25 Oct 2016 22:02:49 +0000 (22:02 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
am:
db1fd054d2 -s ours
Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc
Adrian Roos [Tue, 25 Oct 2016 22:02:44 +0000 (22:02 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
21984eeaf7 -s ours
Change-Id: Ia9508033be03059a382abfaaa2adfc3e415df81b
Adrian Roos [Tue, 25 Oct 2016 21:55:49 +0000 (21:55 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
Adrian Roos [Tue, 25 Oct 2016 21:31:17 +0000 (21:31 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
cb60c7a87e
Change-Id: I7da07f53de4748462f06a805921e7dcd28637820
Adrian Roos [Fri, 21 Oct 2016 21:49:17 +0000 (14:49 -0700)]
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: Id80d62727952f63b363f87c19b5befbde8ab5c31
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Merged-In: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Fixes:
32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
Adrian Roos [Fri, 21 Oct 2016 21:49:17 +0000 (14:49 -0700)]
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Fixes:
32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
Matthew Bouyack [Tue, 25 Oct 2016 16:55:49 +0000 (16:55 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
am:
4f14be3d40
Change-Id: I730a5872a29236e75b40ff270e279caf6b6da16f
Matthew Bouyack [Tue, 25 Oct 2016 16:55:44 +0000 (16:55 +0000)]
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction.
am:
8dd88f649b
Change-Id: Id510d1e5653ec167a4494a9ff14728fca446862c
Matthew Bouyack [Tue, 25 Oct 2016 16:48:17 +0000 (16:48 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
Cheryl Potter [Tue, 25 Oct 2016 15:17:55 +0000 (15:17 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7 am:
2e7c67f3cd
am:
90d300a0b1
Change-Id: Ibcf179723383ad683ad6865a784d1d671fe35015
Cheryl Potter [Tue, 25 Oct 2016 15:14:15 +0000 (15:14 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7
am:
2e7c67f3cd
Change-Id: I489007830f525fa1deaabe6cc78f6b0d41e78a77
Cheryl Potter [Tue, 25 Oct 2016 15:10:22 +0000 (15:10 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908
am:
fb4f5497b7
Change-Id: I1c550fa22586145ec949fe54ef727be814624340
Cheryl Potter [Tue, 25 Oct 2016 15:03:23 +0000 (15:03 +0000)]
docs: change gpu debugger redirect b/
31781348
am:
afbf16f908
Change-Id: I6fa42074ba2fe6019f0bf817a7b21650d2a0dd43
Bill Yi [Tue, 25 Oct 2016 06:36:29 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
bf2eaa1029 -s ours
am:
2be91e7aff -s ours
Change-Id: Icab5326419697a45d9338f0dbc57aa24eb3ac99a
Bill Yi [Tue, 25 Oct 2016 06:35:46 +0000 (06:35 +0000)]
Import translations. DO NOT MERGE am:
9ac3087a90 -s ours
am:
d091556b6c -s ours
Change-Id: I1f27d69564e4601a45cf21cef2149a65130cc0de
Bill Yi [Tue, 25 Oct 2016 06:35:04 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9421be2011 -s ours
am:
45b0084348 -s ours
Change-Id: Ib0d3db1215adf01d90643e55aea65ad2f2ff2073
Bill Yi [Tue, 25 Oct 2016 06:34:17 +0000 (06:34 +0000)]
Import translations. DO NOT MERGE am:
8bea919d37 -s ours
am:
3f7cd6f73b -s ours
Change-Id: I471ace1f6bfd71059e2c3f713d6385064988ada3
Android Build Merger (Role) [Tue, 25 Oct 2016 06:29:58 +0000 (06:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours" into nyc-mr2-dev
Android Build Merger (Role) [Tue, 25 Oct 2016 06:29:39 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:29:33 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 25 Oct 2016 06:29:00 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
a0980e58e4 -s ours
Change-Id: Ib33e112eda5af530b41bb65ad393e2f9b61ac6c1
Bill Yi [Tue, 25 Oct 2016 06:28:59 +0000 (06:28 +0000)]
Import translations. DO NOT MERGE
am:
b3a6a7afe4 -s ours
Change-Id: I2a8b9850a1effd799a88210e55c6183605c0f046
Bill Yi [Tue, 25 Oct 2016 06:27:49 +0000 (06:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
840d1f6797 -s ours
Change-Id: I7fcaa6ea865885d085284c58ccb71a29f275020b
Bill Yi [Tue, 25 Oct 2016 06:27:48 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE
am:
6d512da8e7 -s ours
Change-Id: I01407ceed1d3f8a28b956e156100adc6960f61f4
Bill Yi [Tue, 25 Oct 2016 06:25:44 +0000 (06:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
bf2eaa1029 -s ours
Change-Id: Ib09d545a5ad307e82c04136c57c10fc33eddce48
Bill Yi [Tue, 25 Oct 2016 06:25:41 +0000 (06:25 +0000)]
Import translations. DO NOT MERGE
am:
9ac3087a90 -s ours
Change-Id: I0ef3029490ded71a1145ba8c4b46e7263b938a54
Bill Yi [Tue, 25 Oct 2016 06:24:23 +0000 (06:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
9421be2011 -s ours
Change-Id: Id624f18f91ebf282cf8a5498f0c0b4c6682ea89e
Bill Yi [Tue, 25 Oct 2016 06:24:20 +0000 (06:24 +0000)]
Import translations. DO NOT MERGE
am:
8bea919d37 -s ours
Change-Id: I67c3a96bfa8497980eb80b993a8861d6b13de029
TreeHugger Robot [Tue, 25 Oct 2016 06:23:08 +0000 (06:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:22:39 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:22:03 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:21:14 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:19:58 +0000 (06:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:19:06 +0000 (06:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 25 Oct 2016 04:32:32 +0000 (21:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb57ea645fd79e4cf96c8ca8a1c911a3dd7e761c
Auto-generated-cl: translation import
Cheryl Potter [Tue, 25 Oct 2016 04:29:23 +0000 (21:29 -0700)]
docs: change gpu debugger redirect
b/
31781348
Change-Id: I7e374dcec975ba45b03f1cde656a438f986c5093
Bill Yi [Tue, 25 Oct 2016 04:24:44 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9b8b5245f61dbab513ee5de6ff9c71b2bd41f3ab
Auto-generated-cl: translation import
Lifu Tang [Tue, 25 Oct 2016 04:23:39 +0000 (04:23 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev am:
14bd8017fa
am:
70462bd723
Change-Id: I75313027cc6f0089e3da88850e95873bfa7f175f
Lifu Tang [Tue, 25 Oct 2016 04:22:45 +0000 (04:22 +0000)]
Fix GNSS status delivery to the callbacks am:
4e82fe5120
am:
1e785cd045
Change-Id: If39f545926b4b18f78737c3c00c668508a55b297
Lifu Tang [Tue, 25 Oct 2016 04:16:59 +0000 (04:16 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev
am:
14bd8017fa
Change-Id: I48f6855f6897beb4268b444fb7842939667b2ca9
Lifu Tang [Tue, 25 Oct 2016 04:16:56 +0000 (04:16 +0000)]
Fix GNSS status delivery to the callbacks
am:
4e82fe5120
Change-Id: I5b84890c87bf5742448a772ed358ef6352cb1640
Bill Yi [Tue, 25 Oct 2016 04:16:42 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82aab2fcdb95ad0718ea1d4b6c041a36be0e77ee
Auto-generated-cl: translation import
Lifu Tang [Tue, 25 Oct 2016 04:10:44 +0000 (04:10 +0000)]
Merge "Fix GNSS status delivery to the callbacks" into nyc-mr1-dev
Bill Yi [Tue, 25 Oct 2016 04:06:04 +0000 (21:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8fe6b5f09b7c3daf9c630b5c36d02199248c11b3
Auto-generated-cl: translation import
George French [Tue, 25 Oct 2016 00:36:34 +0000 (00:36 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9 am:
e8e196d007 am:
d544dc785b
am:
5d1af7d918
Change-Id: I7ee574ff28491470cea4f1071c82d473fc07ad85
George French [Tue, 25 Oct 2016 00:30:01 +0000 (00:30 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9 am:
e8e196d007
am:
d544dc785b
Change-Id: I3289a55caaeadd267063916bcdc8e4851327381b
George French [Tue, 25 Oct 2016 00:26:05 +0000 (00:26 +0000)]
docs: Update startService() & bindService() documentation (Proj13) am:
9748d76be9
am:
e8e196d007
Change-Id: I3d804611d1290eb6cf0fa525e492864220fb85fa
George French [Tue, 25 Oct 2016 00:19:33 +0000 (00:19 +0000)]
docs: Update startService() & bindService() documentation (Proj13)
am:
9748d76be9
Change-Id: I976128eb4c14ee2587c9cfa9c34f4b3dc006aa38
Matthew Bouyack [Mon, 24 Oct 2016 21:01:26 +0000 (14:01 -0700)]
Avoid redundant setMatrix calls from setMatrixInTransaction
This matches the behavior of setPositionInTransaction and setSizeInTransaction.
By eliminating calls to setMatrix, we avoid triggering redundant
SurfaceFlinger invalidates. This is particularly noteworthy on Android
Wear where we must update the minute hand every 60 seconds, but want the
device to spend as much time sleeping as possible.
See b/
31489482
Change-Id: I424bb9f60c3033921fa04e7abcfc552500114f1f
Bill Yi [Mon, 24 Oct 2016 23:04:03 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I836ffcc309753e1688f29b62f6a3dc757c8be0b5
Auto-generated-cl: translation import
Bill Yi [Mon, 24 Oct 2016 22:55:26 +0000 (15:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2be2e9036cfae41141574a37a69d76491eb1cb6a
Auto-generated-cl: translation import
Jorim Jaggi [Mon, 24 Oct 2016 22:40:06 +0000 (15:40 -0700)]
Make sure to call dismissKeyguard after setOccluded
If we call it before, SystemUI will not dismiss the Keyguard as
it is still occluded in that state.
Change-Id: I15cf9cc43b9a2b747bfd224a6dfbd769eee19d69
Fixes:
32202560
Lifu Tang [Mon, 24 Oct 2016 20:33:47 +0000 (13:33 -0700)]
Fix GNSS status delivery to the callbacks
Bug:
32357457
Change-Id: I8f2b8dae5472cb81313417e85c092dca0aae5bd9
Bill Yi [Mon, 24 Oct 2016 18:53:48 +0000 (11:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I20ef306c1cfdee6edcc89e206e8333269b755fab
Auto-generated-cl: translation import
George French [Wed, 7 Sep 2016 16:59:32 +0000 (09:59 -0700)]
docs: Update startService() & bindService() documentation (Proj13)
Updated Update startService() and bindService() docs to mention that they
no longer support implicit intent. And mentioned that the Intellegent
job scheduling is now the preferred method for launching services.
We also performed a copy edit, implementing Google styles.
Bug:
18333456
Change-Id: I2b2ec666be870aea15045d30fbc822256d1b9a81
Pankaj Kanwar [Mon, 24 Oct 2016 02:13:18 +0000 (02:13 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
am:
9cac4568e5
Change-Id: I6b1d09378a0a9a82c0ac397ed920ae633232f044
Lorenzo Colitti [Mon, 24 Oct 2016 02:13:15 +0000 (02:13 +0000)]
CaptivePortalLogin: set mixed content policy to compatibility.
am:
625166377b
Change-Id: I536b2f5a80d3ceaed0ffa86501f6d60e2a407641
Pankaj Kanwar [Mon, 24 Oct 2016 02:02:48 +0000 (02:02 +0000)]
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
Bill Yi [Sat, 22 Oct 2016 11:42:09 +0000 (11:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
496d17f748 -s ours
Change-Id: I3c4017b2b089fafacf6b6951ca62da054363827f
Bill Yi [Sat, 22 Oct 2016 11:42:07 +0000 (11:42 +0000)]
Import translations. DO NOT MERGE
am:
300ad2e4b0 -s ours
Change-Id: I6ecb8388aa2baa4733d75cee4628397e9d68e586
Bill Yi [Sat, 22 Oct 2016 11:40:52 +0000 (11:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d849122bbb -s ours
Change-Id: I8612211ea13a7f66963d2b378db3e5c3049a6c72
Bill Yi [Sat, 22 Oct 2016 11:40:50 +0000 (11:40 +0000)]
Import translations. DO NOT MERGE
am:
39eb3b4ac2 -s ours
Change-Id: If06e606ce2c9ad83c680154bc7e5a8bd80af5207
TreeHugger Robot [Sat, 22 Oct 2016 11:36:41 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:35:33 +0000 (11:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:33:13 +0000 (11:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:32:49 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Sat, 22 Oct 2016 08:11:45 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia238fb87c9c8be76cbadfbec1956b629414a3c48
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 07:52:51 +0000 (00:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d5eae9008ead575fda0db5acbd233b4a9cf7273
Auto-generated-cl: translation import
Julius D'souza [Sat, 22 Oct 2016 03:58:25 +0000 (03:58 +0000)]
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
Julius D'souza [Sat, 22 Oct 2016 03:57:59 +0000 (03:57 +0000)]
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
Bill Yi [Sat, 22 Oct 2016 02:45:18 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7564aa066446c6332e6cca5868905a8f05850fcc
Auto-generated-cl: translation import
Bill Yi [Sat, 22 Oct 2016 02:37:08 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c1c1777ee5b308a1632fe4dc6973d94378e55fe
Auto-generated-cl: translation import
Jason Monk [Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
am:
9db47b0f49
Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
Jason Monk [Sat, 22 Oct 2016 02:30:51 +0000 (02:30 +0000)]
Fix vpn branded string usage
am:
59474a40af
Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
Julius D'souza [Sat, 22 Oct 2016 02:16:47 +0000 (19:16 -0700)]
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
Bug:
32169300
Change-Id: If7eb443bc7c4bcc21eb4bc317f4fcd1219e9e25b
Julius D'souza [Sat, 22 Oct 2016 02:21:01 +0000 (02:21 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
This reverts commit
637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.
Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
Jeremy Joslin [Fri, 21 Oct 2016 23:37:57 +0000 (23:37 +0000)]
VPN network stat accounting changes.
am:
3f0d75afe8
Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes:
32071681
Julius D'souza [Fri, 21 Oct 2016 22:29:33 +0000 (22:29 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
Julius D'souza [Fri, 21 Oct 2016 21:06:28 +0000 (14:06 -0700)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
Bug:
32169300
Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
TreeHugger Robot [Fri, 21 Oct 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
Michael Kwan [Fri, 21 Oct 2016 20:38:02 +0000 (20:38 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
Vinod Krishnan [Fri, 21 Oct 2016 05:57:02 +0000 (22:57 -0700)]
Fwk: Only chime when docked and accessbility is on
Bug:
32036947
Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
TreeHugger Robot [Fri, 21 Oct 2016 17:23:42 +0000 (17:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
BUG:
32172459
BUG:
32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
Lorenzo Colitti [Fri, 21 Oct 2016 09:41:25 +0000 (18:41 +0900)]
CaptivePortalLogin: set mixed content policy to compatibility.
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.
Bug:
32171569
Change-Id: Ic8bc1440f1f26898ddbc0984fd1ddd2155c9588b
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
OSDN Git Service
