Lucas Dupin
b77bf39d68
Merge "Block face auth when lock icon is pressed" into qt-dev
...
am: d8941d0451
2019-05-14 22:19:36 -07:00
TreeHugger Robot
d8941d0451
Merge "Block face auth when lock icon is pressed" into qt-dev
2019-05-15 05:04:32 +00:00
Paul Hu
e2695f1f60
[automerger skipped] Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev
...
am: 53e2a9b0aec1af699968
2019-05-14 21:51:21 -07:00
TreeHugger Robot
53e2a9b0ae
Merge "Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission" into qt-dev
2019-05-15 04:38:57 +00:00
Paul Hu
273f61880e
Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode" am: 910b72f109
...
am: f672e96b87
2019-05-14 21:35:43 -07:00
TYM Tsai
e2fb55037a
Merge "Adds the keyguard indication area overlays" into qt-dev
...
am: 18cb49bbab
2019-05-14 21:31:14 -07:00
Tiger Huang
a741d7c8c2
Merge "Fix a bug about the z-order of layers caused by merging transactions" into qt-dev
...
am: 6e52f838ba
2019-05-14 21:24:14 -07:00
Android Build Merger (Role)
18f4dfd31d
Merge "Merge "Generate challenge and reset lockout only if user has enrolled biometrics" into qt-dev am: c6dd30da9f" into qt-dev-plus-aosp
2019-05-15 04:18:59 +00:00
Kevin Chyn
f4e812e61e
Merge "Generate challenge and reset lockout only if user has enrolled biometrics" into qt-dev
...
am: c6dd30da9f
2019-05-14 21:18:36 -07:00
Paul Hu
f672e96b87
Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode"
...
am: 910b72f109
2019-05-14 21:17:33 -07:00
Jack Yu
b8b339bf29
[automerger skipped] Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode" am: 149edbd87b
...
am: 019f54d32f7ff7865d7b
2019-05-14 21:14:39 -07:00
TreeHugger Robot
18cb49bbab
Merge "Adds the keyguard indication area overlays" into qt-dev
2019-05-15 04:02:51 +00:00
Tiger Huang
6e52f838ba
Merge "Fix a bug about the z-order of layers caused by merging transactions" into qt-dev
2019-05-15 03:52:34 +00:00
Kevin Chyn
c6dd30da9f
Merge "Generate challenge and reset lockout only if user has enrolled biometrics" into qt-dev
2019-05-15 03:45:51 +00:00
Paul Hu
910b72f109
Merge "Ignore NetworkTest when running CtsNetTestCases in instant app mode"
2019-05-15 03:42:32 +00:00
Jack Yu
019f54d32f
Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"
...
am: 149edbd87b
2019-05-14 20:32:49 -07:00
Jack Yu
149edbd87b
Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"
2019-05-15 03:04:55 +00:00
Kevin
e66be84adc
Merge "Fix legacy recents crash on Go devices" into qt-dev
...
am: 92f755e339
2019-05-14 19:18:05 -07:00
Paul Hu
eb20d2a231
Fix captive portal app can be launched w/o MAINLINE_NETWORK_STACK permission
...
Caller should get SecurityException if called
ConnectivityManager#startCaptivePortalApp() w/o
MAINLINE_NETWORK_STACK permission. But now it will not get any
exception and can launch captive portal app successfully.
Bug: 132662433
Test: atest android.net.cts.ConnectivityManagerTest#testStartCaptivePortalApp
w and w/o MAINLINE_NETWORK_STACK permission
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
Merged-In: I1025da29beb53259f57bd9ca5648b32f2847ed4a
Merged-In: Ib70fe6fad107f3e9dce9ce673188c5ce5dc1ad7b
(cherry picked from commit 72b3ab18ca
2019-05-15 02:09:52 +00:00
Jeff Sharkey
b7be677e24
Merge "Explicitly request clearing of external storage." into qt-dev
...
am: 9637326ea8
2019-05-14 19:06:04 -07:00
TreeHugger Robot
92f755e339
Merge "Fix legacy recents crash on Go devices" into qt-dev
2019-05-15 01:42:04 +00:00
Mehdi Alizadeh
2f0c8f7e69
Merge "Updates java doc in AppPredictionService" into qt-dev
...
am: 60c9f4803a
2019-05-14 18:39:28 -07:00
Jeff Sharkey
75ab7a6293
Merge "Remember last time we mounted a volume." into qt-dev
...
am: 3ad357f649
2019-05-14 18:30:17 -07:00
Jeff Sharkey
9637326ea8
Merge "Explicitly request clearing of external storage." into qt-dev
2019-05-15 01:29:08 +00:00
Mehdi Alizadeh
60c9f4803a
Merge "Updates java doc in AppPredictionService" into qt-dev
2019-05-15 01:14:05 +00:00
Winson Chung
b50f07c8c3
Merge "Offload role manager work to background thread" into qt-dev
...
am: 7b1973bfb8
2019-05-14 18:12:01 -07:00
Jeff Sharkey
3ad357f649
Merge "Remember last time we mounted a volume." into qt-dev
2019-05-15 01:07:03 +00:00
Lei Yu
fcde0225e6
Merge "Use merged NetworkTemplate to query data usage" into qt-dev
...
am: 35fcd6b0e3
2019-05-14 17:51:03 -07:00
TreeHugger Robot
7b1973bfb8
Merge "Offload role manager work to background thread" into qt-dev
2019-05-15 00:46:17 +00:00
Lei Yu
35fcd6b0e3
Merge "Use merged NetworkTemplate to query data usage" into qt-dev
2019-05-15 00:27:23 +00:00
Kevin Chyn
0937d63919
Merge "Update content descriptions when text/icons are updated" into qt-dev
...
am: 9a086d9f32
2019-05-14 17:22:50 -07:00
Jack Yu
a255aeab99
Fixed incorrect metered/unmetered APN in AP-assisted mode
...
From now all data traffic through IWLAN will be unmetered. Only
data through cellular will be checked for metered/unmetered.
Test: Unit tests
Bug: 132433959
Merged-In: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
Change-Id: Id1498fb8627dd7221a5ab7cde72929e6ee25b425
(cherry picked from commit 7ff7865d7b
2019-05-14 17:19:16 -07:00
Kevin Chyn
d96c741670
Merge "Update acquire string" into qt-dev
...
am: f4585efd51
2019-05-14 17:15:17 -07:00
Kevin Chyn
be76e1d4b3
Merge "Fix several accessibility issues with BiometricPrompt" into qt-dev
...
am: 8575ede8fc
2019-05-14 16:54:04 -07:00
Xiangyu/Malcolm Chen
f4ca0c79ff
Merge "Adding subscription group owner." into qt-dev
...
am: 8343ad4285
2019-05-14 16:30:40 -07:00
Kevin Chyn
9a086d9f32
Merge "Update content descriptions when text/icons are updated" into qt-dev
2019-05-14 23:29:50 +00:00
Kevin Chyn
f4585efd51
Merge "Update acquire string" into qt-dev
2019-05-14 23:28:45 +00:00
Lucas Dupin
ca88e5fb18
Block face auth when lock icon is pressed
...
It's necessary to lock the current user, until the next screen power
cycle, to avoid unlocking the device accidentally.
Fixes: 132129109
Test: atest KeyguardIndicationControllerTest
Test: Unlock with biometrics, long press lock icon, swipe up
Test: Unlock with biometrics, swipe up
Change-Id: I23258a79531c21d0e63bd0a91db59d8950526197
2019-05-14 16:27:50 -07:00
Winson Chung
f105c93c4a
Offload role manager work to background thread
...
Bug: 130305914
Test: Manual
Change-Id: Ifbe25980aa5c91698556b6f0070b5fee06014f31
2019-05-14 16:23:50 -07:00
Kevin Chyn
8575ede8fc
Merge "Fix several accessibility issues with BiometricPrompt" into qt-dev
2019-05-14 23:21:08 +00:00
Xiangyu/Malcolm Chen
8343ad4285
Merge "Adding subscription group owner." into qt-dev
2019-05-14 23:13:19 +00:00
Kevin Chyn
71db85fd08
Generate challenge and reset lockout only if user has enrolled biometrics
...
Fixes: 132723654
Test: Lockout reset still works
Change-Id: I28fcbd22cd0b89082d5183382649d9c3095dd595
2019-05-14 16:10:48 -07:00
Lucas Dupin
e7abfa92bf
Merge "Revert "Remove lousy synchronization"" into qt-dev
...
am: 1cc5f3175f
2019-05-14 16:04:34 -07:00
Lucas Dupin
12a34b05d7
Merge "Check for lock icon nullability" into qt-dev
...
am: e0bbf0e387
2019-05-14 15:53:45 -07:00
TreeHugger Robot
1cc5f3175f
Merge "Revert "Remove lousy synchronization"" into qt-dev
2019-05-14 22:49:27 +00:00
Zimuzo Ezeozue
af14dc08ba
Merge "Retain Activity Recognition permission state across device update" into qt-dev
...
am: dfae02f928
2019-05-14 15:43:49 -07:00
TreeHugger Robot
e0bbf0e387
Merge "Check for lock icon nullability" into qt-dev
2019-05-14 22:38:26 +00:00
Kevin
8b62e317ef
Fix legacy recents crash on Go devices
...
Go does not have PIP enabled and thus does not put the PipUI component
when starting up System UI service componenets. However, as part of
moving things to legacy recents, we are now always listening to PIP menu
events even with the feature disabled and we hit a NPE since we get a
null component. This CL adds a simple null check and backs out if we
don't have the component.
Bug: 132703125
Test: No longer crashes on KB3 Go device
Change-Id: I55e4fc30dc392a8052850a726e756b03fd4c91f6
2019-05-14 22:38:10 +00:00
Nader Jawad
3919ad8862
Merge "Fixed issue where GradientDrawable orientation was not consumed properly" into qt-dev
...
am: 9625faaf73
2019-05-14 15:24:19 -07:00
Zimuzo Ezeozue
dfae02f928
Merge "Retain Activity Recognition permission state across device update" into qt-dev
2019-05-14 22:09:44 +00:00
