Commit Graph

419022 Commits

Author SHA1 Message Date
Dave Mankoff
e28cd16002 Merge "Clear authentication data whenever the phone transitions to DOZE_AOD or DOZE." into qt-r1-dev 2019-06-24 13:24:18 +00:00
Lorenzo Colitti
f80234a9b0 Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev
* changes:
  Inline readNetworkStatsDetailInternal, make mUseBpfStats final
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
2019-06-24 03:37:23 +00:00
Julia Reynolds
df1e8c9cf3 Merge "Handle USER_ALL in instant apps call" into qt-dev
am: 58b7cf731d

Change-Id: Ibdbc61705cf696a8b771c168be1c24bec25f7876
2019-06-22 17:24:45 -07:00
Lucas Dupin
d749a78120 [automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev
am: 9b47581ea4 -s ours
am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA1 2bc992decb is in history

Change-Id: Ic38213cef426e9a808fa436b50119394e36ce1d9
2019-06-22 17:23:10 -07:00
Bill Yi
37caf4810e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 25a43f362a -s ours
am skip reason: subject contains skip directive

Change-Id: I3e9e158d9cf345d64bf9ea77be78353c388e654b
2019-06-22 17:21:08 -07:00
Dave Mankoff
756636cb24 [automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev
am: 6c9547a9a5 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 84c07e9f1a is in history

Change-Id: I485bfd4e21ce2251d41b4d70c29426540927bffb
2019-06-22 17:19:06 -07:00
Jerry Chang
5a5e113271 Merge "Fade away wallpapers when long pulse" into qt-dev
am: 14e6d18ec9

Change-Id: Ia529dee9e06c48035846d2c112bf2993ac2a7bbc
2019-06-22 17:16:14 -07:00
Lucas Dupin
4a08215328 Merge "Wake-and-unlock imprevements" into qt-r1-dev 2019-06-22 23:49:50 +00:00
TreeHugger Robot
58b7cf731d Merge "Handle USER_ALL in instant apps call" into qt-dev 2019-06-22 21:27:12 +00:00
Lucas Dupin
e78794c056 Wake-and-unlock imprevements
Remove MODE_DISMISS_BOUNCER, simplifying dismissal logic
Never wake-up without unlocking when bypassing

Test: unlock with face from AOD2
Test: unlock with face from LS
Test: unlock with face from bouncer
Test: unlock with face from scrimmed bouncer
Fixes: 135571526
Fixes: 132846921
Change-Id: Id468eab8aeed91b6eeadc8bca3b579f977eac2a6
2019-06-22 14:15:45 -07:00
Lucas Dupin
9b47581ea4 Merge "Unregister listeners and reset wake lock" into qt-dev 2019-06-22 20:12:26 +00:00
Lucas Dupin
fe107a1621 Unregister listeners and reset wake lock
The ContentProvider might be recreated by the system, so we it's
not necessarily a singleton. We need to cleanup listener registration
and alarms before reattributing the static variable.

Change-Id: I227842d7272d1edeaa67d776950f369aedb01a91
Merged-In: I227842d7272d1edeaa67d776950f369aedb01a91
Fixes: 135344397
Fixes: 135582651
Test: bind and unbind slice various times
Test: atest KeyguardSliceProviderTest
2019-06-22 19:01:20 +00:00
TreeHugger Robot
d5e9e9c874 Merge "Unregister listeners and reset wake lock" into qt-r1-dev 2019-06-22 18:46:24 +00:00
TreeHugger Robot
25a43f362a Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-22 17:24:18 +00:00
TreeHugger Robot
760558e00a Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-22 16:35:23 +00:00
Dave Mankoff
6c9547a9a5 Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev 2019-06-22 15:41:14 +00:00
Dave Mankoff
e0321d5809 DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
Merged-In: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-22 14:19:01 +00:00
TreeHugger Robot
14e6d18ec9 Merge "Fade away wallpapers when long pulse" into qt-dev 2019-06-22 11:59:49 +00:00
TreeHugger Robot
7e5e70df58 Merge "Prevents posting multiple pulse requests at the same time" into qt-r1-dev 2019-06-22 11:58:41 +00:00
Bill Yi
78e1b4bd5a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I63e4016a8bd2f3d39d3cded18600583936cb4b22
2019-06-22 01:39:39 -07:00
Kevin Chyn
62a7af3f50 Merge "Dump buffer of authentication events for bugreports" into qt-r1-dev 2019-06-22 08:29:29 +00:00
Bill Yi
6ce90273cf Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I62581a342971f2c72fbf24ecd285060a35c6d863
2019-06-21 22:51:00 -07:00
Kevin Chyn
9bc1d495ee Dump buffer of authentication events for bugreports
Last 100 events, plus total accumulated latencies for accept, reject,
and individual errors since last boot.

Fixes: 134429201

Test: adb shell dumpsys face
Change-Id: Idc34143a8e5de1036bb2d82767cf748c15b74822
2019-06-21 18:09:24 -07:00
Youming Ye
c6931e3fbb Merge "Add carrier config for conference participants data support" into qt-dev
am: 23b6339ebd

Change-Id: Id1e5fcf1fbdfe47c73a8e76949ce4d75f03f9ed7
2019-06-21 17:33:29 -07:00
Robert Carr
9e4b7a3f8d Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev
am: 6397ab05f9

Change-Id: I17feac89670b328f88878ce57636cf4954e0c6f3
2019-06-21 17:30:57 -07:00
TreeHugger Robot
23b6339ebd Merge "Add carrier config for conference participants data support" into qt-dev 2019-06-22 00:12:34 +00:00
TreeHugger Robot
6397ab05f9 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 2019-06-22 00:04:19 +00:00
Kevin Chyn
7473e8fda9 Merge "Scale the work profile background properly" into qt-r1-dev 2019-06-21 23:51:18 +00:00
TreeHugger Robot
e5039d3c9f Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-21 23:45:39 +00:00
Dave Mankoff
0cd732ddf3 Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev 2019-06-21 23:31:19 +00:00
Youming Ye
60b023bfd0 Add carrier config for conference participants data support
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
2019-06-21 22:30:08 +00:00
Bill Yi
af16a228a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb62faea41ec53b7e9f0127f64f9e7a2c6af9f0
2019-06-21 15:21:21 -07:00
Aran Ink
b3be57b74c Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
am: 985f21dd43

Change-Id: I9e279d5ccae2ce43a30e217bccd34df3a200285e
2019-06-21 15:18:28 -07:00
TreeHugger Robot
019e1bf3fb Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-21 22:05:31 +00:00
TreeHugger Robot
985f21dd43 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 2019-06-21 22:00:47 +00:00
Kevin Chyn
b4523b39de Scale the work profile background properly
Fixes: 135742033

Test: Set up work profile, use BiometricPromptDemo on both profiles
      Background is not cut off on top / bottom anymore

Change-Id: I40476782c6b38a3562136d6ad0d2f465074dcfc1
2019-06-21 14:16:20 -07:00
Dave Mankoff
84c07e9f1a DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-21 20:43:14 +00:00
Aran Ink
4c0d560563 Clear authentication data whenever the phone transitions to DOZE_AOD or DOZE.
Test: Enable face unlock, disable skip lock screen. Unlock phone with face, then allow to timeout to AOD. Upon wake from reach, power button, or screen tap, the lock icon should be closed, and the phone should require re-authorization via face or password to unlock.
Fixes: 135289187
Change-Id: I567d058dd368226c8de7aaba04e3df5056cbae16
2019-06-21 15:53:08 -04:00
Lajos Molnar
46cb9bed22 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev
am: cfb6f93443

Change-Id: I4d9ba78b41b791db6119fd57fff5c053bcf82f3a
2019-06-21 12:50:37 -07:00
Lajos Molnar
cfb6f93443 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev 2019-06-21 19:38:17 +00:00
Aran Ink
5590c56102 Fix conflict between metrics_constants and settings_enums.
Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
(cherry picked from commit 08659ccdb7)
2019-06-21 19:36:20 +00:00
Selim Cinek
839b1659cd [automerger skipped] Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev
am: c65d4b728c -s ours
am skip reason: change_id Ia64238f30620d9906aa50c2469121c2653875e8d with SHA1 5dc581aef2 is in history

Change-Id: If188f2ed89de4ac8f0366b0f0b9ea979e90575ba
2019-06-21 12:05:50 -07:00
Philip P. Moltmann
ef146c3716 Merge "Prevent loop in PermissionPolicyService" into qt-dev
am: 2c824e3a7a

Change-Id: I3b705dec21aaff8024b30a3b5dcb409135eeba71
2019-06-21 12:03:26 -07:00
TreeHugger Robot
c65d4b728c Merge "DO NOT MERGE: Fixed an issue about notification icons on AOD" into qt-dev 2019-06-21 18:57:25 +00:00
Lucas Dupin
2bc992decb Unregister listeners and reset wake lock
The ContentProvider might be recreated by the system, so we it's
not necessarily a singleton. We need to cleanup listener registration
and alarms before reattributing the static variable.

Change-Id: I227842d7272d1edeaa67d776950f369aedb01a91
Fixes: 135344397
Fixes: 135582651
Test: bind and unbind slice various times
Test: atest KeyguardSliceProviderTest
2019-06-21 18:41:57 +00:00
TreeHugger Robot
2c824e3a7a Merge "Prevent loop in PermissionPolicyService" into qt-dev 2019-06-21 18:34:53 +00:00
Antoan Angelov
648eb2d3a7 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: ab34f61c3b

Change-Id: I4b0230f1429e5ca278fa6f5c15babddb1a71cda6
2019-06-21 11:15:06 -07:00
Antoan Angelov
ab34f61c3b Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 2019-06-21 18:07:22 +00:00
Ned Burns
95980038f2 Merge "Free up memory in the ZigZagClassifierTest." into qt-dev
am: 0031e00da6

Change-Id: I41258c461f513924563049d553457c58b192abae
2019-06-21 10:59:52 -07:00
Winson Chung
4ea9a20414 Merge "Continue with the animation if wallpaper fails to draw" into qt-dev
am: 7c77aaefb7

Change-Id: I7cd886c145c00de24c3b30d61c3776f3963769be
2019-06-21 10:46:33 -07:00