OSDN Git Service
Michael Wachenschwanz [Fri, 25 May 2018 00:35:33 +0000 (17:35 -0700)]
Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev am:
d55c618340
am:
2c2424a091
Change-Id: I707afa9244687be4356b5f7109b320433737239a
Nicolas Geoffray [Fri, 25 May 2018 00:32:19 +0000 (17:32 -0700)]
Merge "Add camera APIs to light grey." into pi-dev am:
9ed0da42b3
am:
5931603f3d
Change-Id: I08a11e157b36493d80a91f856c589e20b35de2a4
Mathew Inwood [Fri, 25 May 2018 00:29:20 +0000 (17:29 -0700)]
Merge "More greylist additions from bug scrape." into pi-dev am:
7ac3797f16
am:
1a0fa5af88
Change-Id: I66e6189644529907884aafafda6ca4ffc14da225
Jaewan Kim [Fri, 25 May 2018 00:26:14 +0000 (17:26 -0700)]
Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev am:
0e7a307e14
am:
0349869c06
Change-Id: I1ae64f0ac0192afd4e6fc777a1ed4b2b7dd579a3
Hui Yu [Fri, 25 May 2018 00:23:11 +0000 (17:23 -0700)]
Merge "Calculate cellular radio value from modem.controller values." into pi-dev am:
b82d3d7e74
am:
1fa3b11dfe
Change-Id: I53bfc386637e2cf8358703e1844160ad470b24cd
Winson Chung [Fri, 25 May 2018 00:10:23 +0000 (17:10 -0700)]
Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am:
004e01d388" into pi-dev-plus-aosp
am:
ac4381d357
Change-Id: I613bac5e256a5d0cb7b51dedd2ca528dd3422e2f
Daisuke Teranishi [Fri, 25 May 2018 00:03:53 +0000 (17:03 -0700)]
Merge "Use correct filename when adding to ringtone" am:
daff857ffd am:
24062f05d3
am:
2e92e5c30b
Change-Id: I36e7f3d6787deb0c1efdcdaf55d209f55dcdc625
Mike Digman [Thu, 24 May 2018 23:59:53 +0000 (16:59 -0700)]
Merge "Merge "Fork navbar layout for quickstep" into pi-dev am:
5d8559fea3" into pi-dev-plus-aosp
am:
92b686dd69
Change-Id: Ic2c63428d5f217ef53a6233d01292be26bd89699
David Brazdil [Thu, 24 May 2018 23:53:25 +0000 (16:53 -0700)]
Merge changes from topic "am-
dfb2548770de4bb299490c765377bd11" into pi-dev-plus-aosp
am:
8c8f08642d
Change-Id: Ic99d3e8ecd9c41769e4694fa737d809c7c5fa01d
David Brazdil [Thu, 24 May 2018 23:43:02 +0000 (16:43 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am:
85c81cb24c -s ours am:
6041de0722 -s ours
am:
a987892d2d -s ours
Change-Id: If82edacb5893db43f6c8f5c37e73fa0ffe82efdd
Winson Chung [Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)]
Merge "Merge "Fix issue with slippery flag not being updated correctly" into pi-dev am:
6450335b56" into pi-dev-plus-aosp
am:
c272e26926
Change-Id: Ie50c98030e3729fb0cd3a4ce909158fa0828fc73
Rohan Shah [Thu, 24 May 2018 23:29:12 +0000 (16:29 -0700)]
Merge "Merge "[Notif] Remove transient views on swipe out" into pi-dev am:
3622bfdba0" into pi-dev-plus-aosp
am:
407d494564
Change-Id: I8b9c9dce82047a0ad4df48f5b93dcd24d4cfca92
Remi NGUYEN VAN [Thu, 24 May 2018 23:23:43 +0000 (16:23 -0700)]
[automerger skipped] Merge changes I3b3bcbbd,I18b3f263,I3c416c1a am:
7b0935509d am:
20c62063b6 -s ours
am:
a0eaaddc8a -s ours
Change-Id: Iff267b941a8904aa2c6555a6d9f66bcb0fe0eb28
Suprabh Shukla [Thu, 24 May 2018 23:20:02 +0000 (16:20 -0700)]
Merge "Merge "Unsuspending packages when a PO or DO is set" into pi-dev am:
24e913e5a8" into pi-dev-plus-aosp
am:
96471dbe45
Change-Id: Ic32837a81ba6c52f3188a8de0596e99327e7b86a
Justin Yun [Thu, 24 May 2018 23:14:07 +0000 (16:14 -0700)]
Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am:
062c050d01" into pi-dev-plus-aosp
am:
c7a55ad418
Change-Id: I862b506697883856e6ae88a0d6c9cc90e056758f
Dongwon Kang [Thu, 24 May 2018 23:08:11 +0000 (16:08 -0700)]
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am:
1a9def3dc7" into pi-dev-plus-aosp
am:
42542ca0bb
Change-Id: I2c892282a2aee6b03395b1c61ebae19df8c4397c
Tracy Zhou [Thu, 24 May 2018 23:02:12 +0000 (16:02 -0700)]
Merge "Merge "Remove logging from RecentsOnboarding" into pi-dev am:
ee9b570dce" into pi-dev-plus-aosp
am:
42515b706f
Change-Id: Iffc4271cc094c361e38a7ff63e746f6ac3a45707
Hui Yu [Thu, 24 May 2018 22:55:54 +0000 (15:55 -0700)]
Merge "Merge "Fix per app GPS power usage." into pi-dev am:
da4c54e9da" into pi-dev-plus-aosp
am:
df34735c50
Change-Id: I7ca08692d661c56cedf3548c5d557472e7b16caf
Arthur Hung [Thu, 24 May 2018 21:47:23 +0000 (14:47 -0700)]
Merge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev am:
d732ec697e" into pi-dev-plus-aosp
am:
bcc442d7bc
Change-Id: I69c0542bcac7e2370f93b3db53ad56f3d0740923
Erik Kline [Thu, 24 May 2018 21:37:15 +0000 (14:37 -0700)]
Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am:
a7183b92c4 am:
95cb9a1cb3 -s ours" into pi-dev-plus-aosp
am:
9f376da4b9 -s ours
Change-Id: I6424a73acdc4829920e864b122455d4f90776aab
Lajos Molnar [Thu, 24 May 2018 21:22:49 +0000 (14:22 -0700)]
Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev am:
604064e82d
am:
226687cb4d
Change-Id: Ie4ff2a9d4a268944d96b6dbed7a0eb734cd0cd71
Tracy Zhou [Thu, 24 May 2018 20:54:17 +0000 (13:54 -0700)]
Merge "Prevent onboarding counters from overflow." into pi-dev am:
0ce1cc626b
am:
e3cce5bf98
Change-Id: I414527e5247f64500b375e9cfc6ac103fc6cf9bd
TreeHugger Robot [Thu, 24 May 2018 20:27:55 +0000 (20:27 +0000)]
Merge "Store flashlight status and broadcast it needed for flashlight slice."
Michael Wachenschwanz [Thu, 24 May 2018 19:53:33 +0000 (12:53 -0700)]
Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev
am:
d55c618340
Change-Id: I88a269fd3bcb9f6cda5c6f95ac7edb84db1239f1
Nicolas Geoffray [Thu, 24 May 2018 19:48:57 +0000 (12:48 -0700)]
Merge "Add camera APIs to light grey." into pi-dev
am:
9ed0da42b3
Change-Id: I985d6d64b670b4f56ad684c94bc83b21b7bd4185
Mathew Inwood [Thu, 24 May 2018 19:44:22 +0000 (12:44 -0700)]
Merge "More greylist additions from bug scrape." into pi-dev
am:
7ac3797f16
Change-Id: I9146e0e5d0bc39438c836f9e2cddd881e08b2a16
Jaewan Kim [Thu, 24 May 2018 19:39:29 +0000 (12:39 -0700)]
Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
am:
0e7a307e14
Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf
Hui Yu [Thu, 24 May 2018 19:34:51 +0000 (12:34 -0700)]
Merge "Calculate cellular radio value from modem.controller values." into pi-dev
am:
b82d3d7e74
Change-Id: Id309129d9a12a2ec97785c0ef69d09e4cce1dd27
Lucas Dupin [Thu, 24 May 2018 19:30:35 +0000 (12:30 -0700)]
Merge "SystemUI theme feature flag" into pi-dev am:
3884e936c9
am:
2fd55ef0f3
Change-Id: I49482a8ca297b72110d8309051564bccd970b42f
TreeHugger Robot [Thu, 24 May 2018 19:20:43 +0000 (19:20 +0000)]
Merge "Frameworks: convert platformprotos to soong"
Android Build Merger (Role) [Thu, 24 May 2018 19:19:30 +0000 (19:19 +0000)]
Merge "Merge "Initial changes for full-width quickscrub." into pi-dev am:
004e01d388" into pi-dev-plus-aosp
Winson Chung [Thu, 24 May 2018 19:18:58 +0000 (12:18 -0700)]
Merge "Initial changes for full-width quickscrub." into pi-dev
am:
004e01d388
Change-Id: I47d4709cd607cb12057c36f76074474ba0875f45
Daisuke Teranishi [Thu, 24 May 2018 19:18:14 +0000 (12:18 -0700)]
Merge "Use correct filename when adding to ringtone" am:
daff857ffd
am:
24062f05d3
Change-Id: Id9d89491c5604b1611b22f215827f55de98f8ac2
Android Build Merger (Role) [Thu, 24 May 2018 19:14:40 +0000 (19:14 +0000)]
Merge "Merge "Fork navbar layout for quickstep" into pi-dev am:
5d8559fea3" into pi-dev-plus-aosp
Mike Digman [Thu, 24 May 2018 19:14:13 +0000 (12:14 -0700)]
Merge "Fork navbar layout for quickstep" into pi-dev
am:
5d8559fea3
Change-Id: I90f524dba0edfdee7b83f71d7f6b69fc9c48855e
Android Build Merger (Role) [Thu, 24 May 2018 19:11:45 +0000 (19:11 +0000)]
Merge changes from topic "am-
dfb2548770de4bb299490c765377bd11" into pi-dev-plus-aosp
* changes:
Merge changes Id81271ff,I8f298371 am:
e7372ab0d5 am:
e770b16975
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am:
85c81cb24c -s ours am:
6041de0722 -s ours
David Brazdil [Thu, 24 May 2018 19:11:13 +0000 (12:11 -0700)]
Merge changes Id81271ff,I8f298371 am:
e7372ab0d5
am:
e770b16975
Change-Id: I60749ef44cb4dc2c1629831daabb71ed76030c97
Android Build Merger (Role) [Thu, 24 May 2018 19:09:59 +0000 (19:09 +0000)]
Merge "Merge "Fix issue with slippery flag not being updated correctly" into pi-dev am:
6450335b56" into pi-dev-plus-aosp
Winson Chung [Thu, 24 May 2018 19:09:25 +0000 (12:09 -0700)]
Merge "Fix issue with slippery flag not being updated correctly" into pi-dev
am:
6450335b56
Change-Id: If81769bf6e7911be9e16a2a092cff43b345dedce
David Brazdil [Thu, 24 May 2018 19:06:00 +0000 (12:06 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am:
85c81cb24c -s ours
am:
6041de0722 -s ours
Change-Id: I1fe6b92ca9db6ea66427760fb529b39aaf30b304
Android Build Merger (Role) [Thu, 24 May 2018 19:05:13 +0000 (19:05 +0000)]
Merge "Merge "[Notif] Remove transient views on swipe out" into pi-dev am:
3622bfdba0" into pi-dev-plus-aosp
Rohan Shah [Thu, 24 May 2018 19:04:40 +0000 (12:04 -0700)]
Merge "[Notif] Remove transient views on swipe out" into pi-dev
am:
3622bfdba0
Change-Id: I6038513050265cdd508188bc71f42b1a42eaf8e5
Remi NGUYEN VAN [Thu, 24 May 2018 19:03:38 +0000 (12:03 -0700)]
[automerger skipped] Merge changes I3b3bcbbd,I18b3f263,I3c416c1a am:
7b0935509d
am:
20c62063b6 -s ours
Change-Id: Ib1c7270ff0b4dff4f693d9d9a7330bd70ec7505d
Android Build Merger (Role) [Thu, 24 May 2018 19:00:30 +0000 (19:00 +0000)]
Merge "Merge "Unsuspending packages when a PO or DO is set" into pi-dev am:
24e913e5a8" into pi-dev-plus-aosp
Suprabh Shukla [Thu, 24 May 2018 19:00:03 +0000 (12:00 -0700)]
Merge "Unsuspending packages when a PO or DO is set" into pi-dev
am:
24e913e5a8
Change-Id: Ibc0d2d064fa642f668cf084022f0f7d10e82bc88
Android Build Merger (Role) [Thu, 24 May 2018 18:55:51 +0000 (18:55 +0000)]
Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am:
062c050d01" into pi-dev-plus-aosp
Justin Yun [Thu, 24 May 2018 18:54:36 +0000 (11:54 -0700)]
Merge "Camera: Use fallback key if the requested key returns null" into pi-dev
am:
062c050d01
Change-Id: If26bfe174dcc91e52ffae386041a9215c87316f8
Android Build Merger (Role) [Thu, 24 May 2018 18:50:26 +0000 (18:50 +0000)]
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am:
1a9def3dc7" into pi-dev-plus-aosp
Dongwon Kang [Thu, 24 May 2018 18:50:00 +0000 (11:50 -0700)]
Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev
am:
1a9def3dc7
Change-Id: I7ebee18631081dbd11dc54227c77d451358b8234
Android Build Merger (Role) [Thu, 24 May 2018 18:45:53 +0000 (18:45 +0000)]
Merge "Merge "Remove logging from RecentsOnboarding" into pi-dev am:
ee9b570dce" into pi-dev-plus-aosp
Tracy Zhou [Thu, 24 May 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Remove logging from RecentsOnboarding" into pi-dev
am:
ee9b570dce
Change-Id: I900357e6545ea873095cb1e29bdf21c5b60be4f0
Ryan Mitchell [Thu, 24 May 2018 18:42:22 +0000 (18:42 +0000)]
Merge "AAPT2: Accept density config as default"
Android Build Merger (Role) [Thu, 24 May 2018 18:41:17 +0000 (18:41 +0000)]
Merge "Merge "Fix per app GPS power usage." into pi-dev am:
da4c54e9da" into pi-dev-plus-aosp
Hui Yu [Thu, 24 May 2018 18:40:54 +0000 (11:40 -0700)]
Merge "Fix per app GPS power usage." into pi-dev
am:
da4c54e9da
Change-Id: I16400dccbc2328548f93cf0fd285cd9be6e07351
TreeHugger Robot [Thu, 24 May 2018 18:38:07 +0000 (18:38 +0000)]
Merge "Remove TODO in statsd AnomalyTracker_test"
Android Build Merger (Role) [Thu, 24 May 2018 18:36:40 +0000 (18:36 +0000)]
Merge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev am:
d732ec697e" into pi-dev-plus-aosp
Arthur Hung [Thu, 24 May 2018 18:36:20 +0000 (11:36 -0700)]
Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev
am:
d732ec697e
Change-Id: Ibdb26abc0c52d3a3de5e80e49dee92809767d08b
Daisuke Teranishi [Thu, 24 May 2018 18:36:15 +0000 (11:36 -0700)]
Merge "Use correct filename when adding to ringtone"
am:
daff857ffd
Change-Id: If0d096e7b33c84522c11077df04407ecc224fcf1
Android Build Merger (Role) [Thu, 24 May 2018 18:32:50 +0000 (18:32 +0000)]
Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am:
a7183b92c4 am:
95cb9a1cb3 -s ours" into pi-dev-plus-aosp
Erik Kline [Thu, 24 May 2018 18:32:32 +0000 (11:32 -0700)]
[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am:
a7183b92c4
am:
95cb9a1cb3 -s ours
Change-Id: I544b4901f51e6c3038045ef8f7e838161e06ec39
Lajos Molnar [Thu, 24 May 2018 18:31:46 +0000 (11:31 -0700)]
Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev
am:
604064e82d
Change-Id: Id6b79446fb99644b2ce346d58e38f91302d891d1
David Brazdil [Thu, 24 May 2018 18:30:28 +0000 (11:30 -0700)]
Merge changes Id81271ff,I8f298371
am:
e7372ab0d5
Change-Id: I7e59da1705c22b6f9cb2b3bb78986fdb647716f7
David Brazdil [Thu, 24 May 2018 18:29:04 +0000 (11:29 -0700)]
[automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
am:
85c81cb24c -s ours
Change-Id: If9cfeeed5cfe1cc7511d540e5560f61356a080dd
Tracy Zhou [Thu, 24 May 2018 18:27:04 +0000 (11:27 -0700)]
Merge "Prevent onboarding counters from overflow." into pi-dev
am:
0ce1cc626b
Change-Id: I187b0d39be0535d108d3a17151aa5ae1314fdaeb
Lucas Dupin [Thu, 24 May 2018 18:13:58 +0000 (11:13 -0700)]
Merge "SystemUI theme feature flag" into pi-dev
am:
3884e936c9
Change-Id: Ie3ef39ec76e782f4f6893207106d2e25243af793
Remi NGUYEN VAN [Thu, 24 May 2018 17:57:46 +0000 (10:57 -0700)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
am:
7b0935509d
Change-Id: I3bf92d8c1d1b4451b1af9dcb518b352ae40cc7ca
Tony Huang [Thu, 24 May 2018 17:47:03 +0000 (10:47 -0700)]
Merge "Refactor for tuning gfx-max-frame-time-99" into pi-dev am:
845e89320d
am:
111dc8257f
Change-Id: I04de20030a208c9529a7035b2465df479f50358a
Steven Wu [Thu, 24 May 2018 00:04:58 +0000 (20:04 -0400)]
Store flashlight status and broadcast it needed for flashlight slice.
Test: manual
Bug:
74913192
Change-Id: I54ead1727d08b113dec13e3f7c128895770e68f1
Todd Kennedy [Thu, 24 May 2018 17:41:14 +0000 (10:41 -0700)]
Merge "Use STOCK_PM_FLAGS for backup agent" into pi-dev am:
3cc8336198
am:
fb13aa9cf8
Change-Id: I36f3895739b393cdf9f6473e804014ef60c08b09
Stan Iliev [Thu, 24 May 2018 17:36:40 +0000 (10:36 -0700)]
Merge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev am:
a2cc38e7fb
am:
8deb6ac7cd
Change-Id: Icc245a07ca723cce71263002a2e613f7c52f227d
Bookatz [Thu, 24 May 2018 17:35:02 +0000 (10:35 -0700)]
Remove TODO in statsd AnomalyTracker_test
The underlying item the TODO is referencing had already been resolved
so the test line can be properly added, per the TODO.
Change-Id: I5c16e7ea319bd16e37475381def656b38f39d17f
Fixes:
80095149
Test: make statsd_test && adb sync data && adb shell data/nativetest64/statsd_test/statsd_test
Treehugger Robot [Thu, 24 May 2018 16:55:49 +0000 (16:55 +0000)]
Merge "Use correct filename when adding to ringtone"
Ryan Mitchell [Wed, 23 May 2018 20:31:28 +0000 (13:31 -0700)]
AAPT2: Accept density config as default
When a resource does not have a default config value defined, and the
resource only has config values defined for language translations, that
resource should be removed; however, if the resource also contains a
density specific config value, the resource should not be removed.
This is because a density specific value should have the same content as
what the default value would have, just higher or lower quality.
Bug:
76413048
Test: aapt2_tests
Change-Id: I52fe37a7aa3aefb694d3af6c8adfd6269fa26f54
Michael Wachenschwanz [Thu, 24 May 2018 15:54:05 +0000 (15:54 +0000)]
Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev
Michael Wachenschwanz [Thu, 24 May 2018 15:28:24 +0000 (15:28 +0000)]
Revert "Write UsageEvents Parcel data as a Blob"
This reverts commit
f5bae21c5efcd51c0b3fb29942c02c00b896fccf.
Reason for revert:
Bug:
79860717
Fixes:
80215357
Change-Id: I0768e5ce0a95afe7ff091c0035335437bb33c46c
Erik Kline [Thu, 24 May 2018 14:39:50 +0000 (07:39 -0700)]
Merge "Fixup SntpClient to bypass Private DNS"
am:
a7183b92c4
Change-Id: I51e0e71f81307c38599c4bbac385ebafeb9f441f
TreeHugger Robot [Thu, 24 May 2018 13:13:18 +0000 (13:13 +0000)]
Merge "Add getCurrentTransportComponent() API"
Nicolas Geoffray [Thu, 24 May 2018 12:31:13 +0000 (12:31 +0000)]
Merge "Add camera APIs to light grey." into pi-dev
TreeHugger Robot [Thu, 24 May 2018 12:17:41 +0000 (12:17 +0000)]
Merge "More greylist additions from bug scrape." into pi-dev
Mathew Inwood [Thu, 24 May 2018 10:37:56 +0000 (11:37 +0100)]
More greylist additions from bug scrape.
Test: m
Bug:
64382372
Bug:
79950834
Bug:
80004540
Bug:
80109977
Bug:
80112684
Bug:
80204728
Change-Id: I8343f0d467a5d1ecd4e00abcf44871089e8453b3
Treehugger Robot [Thu, 24 May 2018 10:14:08 +0000 (10:14 +0000)]
Merge changes Id81271ff,I8f298371
* changes:
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
TreeHugger Robot [Thu, 24 May 2018 09:59:28 +0000 (09:59 +0000)]
Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
David Brazdil [Wed, 23 May 2018 14:58:36 +0000 (15:58 +0100)]
DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: Id81271ffe2080091d4e4c3d40325183b086dba8e
David Brazdil [Wed, 23 May 2018 14:54:31 +0000 (15:54 +0100)]
DO NOT MERGE ANYWHERE Sort hiddenapi-p-light-greylist.txt
Test: N/A
Change-Id: I8f298371df3efbc3d968c95337e058d6140fe5de
Remi NGUYEN VAN [Thu, 24 May 2018 07:53:00 +0000 (07:53 +0000)]
Merge changes I3b3bcbbd,I18b3f263,I3c416c1a
* changes:
Use CaptivePortalProbeSpec method in portal app
Add configurable captive portal probes
Move CaptivePortalProbeResult to its own file
Treehugger Robot [Thu, 24 May 2018 07:07:15 +0000 (07:07 +0000)]
Merge "Fixup SntpClient to bypass Private DNS"
TreeHugger Robot [Thu, 24 May 2018 06:11:27 +0000 (06:11 +0000)]
Merge "Calculate cellular radio value from modem.controller values." into pi-dev
Winson Chung [Thu, 24 May 2018 05:55:47 +0000 (05:55 +0000)]
Merge "Initial changes for full-width quickscrub." into pi-dev
TreeHugger Robot [Thu, 24 May 2018 05:03:14 +0000 (05:03 +0000)]
Merge "Fork navbar layout for quickstep" into pi-dev
Erik Kline [Tue, 22 May 2018 12:15:49 +0000 (21:15 +0900)]
Fixup SntpClient to bypass Private DNS
NTP may be necessary in order to validate Private DNS certificates,
so it should be allowed to bypass Private DNS.
Test: as follows
- built, flashed, booted
- tcpdump for port 53; adb shell am restart
queries for the NTP hostname appear in the clear
- runtest frameworks-net passes
Bug:
64133961
Bug:
80118648
Merged-In: I4655e3ce5691098c73bf070b8a9e4759485bb17a
Merged-In: I327b816a9f472e94328232157a3b8887d17b0baf
Change-Id: Id9ceb3fcaaffb48cbbd4cd381d48cae991572c9e
(cherry picked from commit
7eccfeb9ca60aa6e09afbdf3a4435cb2f0d12987)
Winson Chung [Thu, 24 May 2018 04:13:47 +0000 (04:13 +0000)]
Merge "Fix issue with slippery flag not being updated correctly" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 03:47:27 +0000 (03:47 +0000)]
Merge "[Notif] Remove transient views on swipe out" into pi-dev
Winson Chung [Tue, 22 May 2018 01:41:39 +0000 (18:41 -0700)]
Initial changes for full-width quickscrub.
Bug:
79945202
Test: Swipe from anywhere in the nav bar
Change-Id: Ib0b07ceb64fb74c570c297acf865a37a1dc56fa8
Remi NGUYEN VAN [Tue, 22 May 2018 08:04:17 +0000 (17:04 +0900)]
Use CaptivePortalProbeSpec method in portal app
This only changes behavior if the EXTRA_CAPTIVE_PORTAL_PROBE_SPEC extra
is passed, which only happens if extra probe specs have been defined in
settings.
Bug: b/
79499239
Test: manual: on 2 different portals, works w/ and w/o the setting
Merged-In: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447
Merged-In: I851d8c41d42dccb03f813e549439f44c83f7d5ac
(clean cherry-pick of pi-dev I70acfd9213bf620cbb79ad999b8ad03472e8d43f)
Change-Id: I3b3bcbbd380f8cbd0b663556d55276f43e30b3e5
Remi NGUYEN VAN [Tue, 22 May 2018 01:01:53 +0000 (10:01 +0900)]
Add configurable captive portal probes
The probes allow testing for a configurable status code and location
header (regexes). They are disabled by default, so this CL is a
no-op unless the probe configurations are pushed.
Bug: b/
79499239
Test: tests in CL pass, manual: captive portal login works
Merged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
Merged-In: Ia958815325d1466345e9626efc8f62fc9d08d774
(clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9)
Change-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835
Remi NGUYEN VAN [Tue, 22 May 2018 00:58:19 +0000 (09:58 +0900)]
Move CaptivePortalProbeResult to its own file
This is necessary to resolve visibility issues for the next change.
Bug: b/
79499239
Test: runtest frameworks-net
Merged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1
Merged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9
(Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299)
Change-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562
TreeHugger Robot [Thu, 24 May 2018 03:01:38 +0000 (03:01 +0000)]
Merge "Unsuspending packages when a PO or DO is set" into pi-dev
Winson Chung [Thu, 24 May 2018 01:24:13 +0000 (18:24 -0700)]
Fix issue with slippery flag not being updated correctly
- The ordering was such that the disabled state was updated before
onPanelExpandedChange which was masking the issue by updating the
slippery flag, but when unlocking from the screen off state, we get
onPanelExpandedChange first, and disabled state after (which doesn't
update the slippery state).
Bug:
80204751
Test: Turn screen off, unlock with fingerprint, swipe up
Change-Id: I88f1bc6a983ec0d693844724d8b9d4bf11a0fd31
Daisuke Teranishi [Fri, 18 May 2018 00:43:54 +0000 (09:43 +0900)]
Use correct filename when adding to ringtone
If the title of the music file includes "/", it's recognized
as a directory separator.
Use correct filename to select the file properly.
Bug:
80202253
Test: Add mp3 which title includes "/" to ringtone
Change-Id: I9bb05f6fe2d7d4dbbdf4f67db7ac6fde04707979
Petr Cermak [Thu, 24 May 2018 02:38:34 +0000 (19:38 -0700)]
Merge "Add FLAG_ACTIVITY_CLEAR_TOP to more details intent" into pi-dev am:
261a101ac2
am:
801f05120f
Change-Id: I1db7aaedd3267ccaaf150388503347d55b71178b
OSDN Git Service
