OSDN Git Service
Michael Wright [Wed, 5 Jun 2019 11:51:36 +0000 (04:51 -0700)]
Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev
am:
eeffe0c9dd
Change-Id: Ia3bf3dc5d7c8bdcf6246321195a4f47628a37dcf
TreeHugger Robot [Wed, 5 Jun 2019 11:31:25 +0000 (11:31 +0000)]
Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev
Jorim Jaggi [Wed, 5 Jun 2019 10:12:30 +0000 (03:12 -0700)]
Merge "Do not hold lock when trying to get snapshot" into qt-dev
am:
beee882cdf
Change-Id: Ib05ead915b0e84cef8d837c02d9e7ed04a57fa31
Jorim Jaggi [Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)]
Merge "Do not hold lock when trying to get snapshot" into qt-dev
Brad Ebinger [Wed, 5 Jun 2019 08:11:43 +0000 (01:11 -0700)]
Merge "Switch DDS during MSIM emergency call" into qt-dev
am:
fcc6df7c6d
Change-Id: Ibad3c48368e759864b686affdfbe3d5aa2a4b738
Bill Yi [Wed, 5 Jun 2019 08:10:27 +0000 (01:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
d10a92f20c -s ours
am skip reason: subject contains skip directive
Change-Id: I761eb5f8a956555ef6341f001b6ba952a1c888e8
Bill Yi [Wed, 5 Jun 2019 08:08:18 +0000 (01:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
9d6d37ad3a -s ours
am skip reason: subject contains skip directive
Change-Id: Ibad3b67a5257fb2bec72bb305d6dbb097d3acaa0
TreeHugger Robot [Wed, 5 Jun 2019 05:08:02 +0000 (05:08 +0000)]
Merge "Switch DDS during MSIM emergency call" into qt-dev
TreeHugger Robot [Wed, 5 Jun 2019 04:40:45 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 5 Jun 2019 04:40:36 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 5 Jun 2019 04:36:44 +0000 (04:36 +0000)]
Merge "Lock screen string change" into qt-r1-dev
Joshua Mccloskey [Wed, 5 Jun 2019 04:24:34 +0000 (04:24 +0000)]
Merge "Fixed talkback issue" into qt-r1-dev
Bill Yi [Wed, 5 Jun 2019 03:14:30 +0000 (20:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I356f6734d4c95d538271eabbc649bca4d2eb848b
Bill Yi [Wed, 5 Jun 2019 03:09:14 +0000 (20:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If4bcd8bbd4cfea27f62b11f628420aaff2cd02d3
Lucas Dupin [Wed, 5 Jun 2019 02:18:21 +0000 (19:18 -0700)]
Merge "Fix issue where panel opacity could be wrong" into qt-dev
am:
30e9b45cd9
Change-Id: I8e374891a8bb75b390d2c78e23660ff7c65c9795
Alex Salo [Wed, 5 Jun 2019 02:14:26 +0000 (19:14 -0700)]
Merge "Don't call ActivityManagerService on main thread" into qt-dev
am:
9a01bb4280
Change-Id: I8cf6502fe286dc37846f373a35b94f18a977f04e
Lucas Dupin [Wed, 5 Jun 2019 01:56:49 +0000 (18:56 -0700)]
Lock screen string change
Test: manual
Fixes:
133876098
Change-Id: Ie45c68098b7e4cf4605c33ea4767444ddc85537e
Mathieu Chartier [Wed, 5 Jun 2019 01:25:55 +0000 (18:25 -0700)]
Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev
am:
652b445c07
Change-Id: I20a9d5a5c2dbeaf778808e82f4a992d9446e60b3
Bill Yi [Wed, 5 Jun 2019 01:24:22 +0000 (18:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
0906e02aa3 -s ours
am skip reason: subject contains skip directive
Change-Id: I32e5d4d452538b501d9b538e188316dab0548f45
Bill Yi [Wed, 5 Jun 2019 01:22:55 +0000 (18:22 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
452be4963c -s ours
am skip reason: subject contains skip directive
Change-Id: I6c1d62458eb5d1aad5a02877bb4dbc1bf7239bf9
Tracy Zhou [Wed, 5 Jun 2019 01:21:31 +0000 (18:21 -0700)]
Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev
am:
289583ec1a
Change-Id: Id0886d75e65fed676d828d7d0f1e6783c6a1d837
Hui Yu [Wed, 5 Jun 2019 01:20:04 +0000 (18:20 -0700)]
Merge "Only set mStartClockTime when device is fully charged." into qt-dev
am:
28d28a4ee5
Change-Id: I902918ae0523e9a1c57bf4d867cd4d17847b4867
David Sehr [Wed, 5 Jun 2019 01:18:20 +0000 (18:18 -0700)]
Merge "Add system option to disable lock profiling" into qt-dev
am:
10d9320c3a
Change-Id: I59355027ead8d03df7adc6d424c4b8e18b0ea78c
Winson Chung [Wed, 5 Jun 2019 01:16:37 +0000 (18:16 -0700)]
Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev
am:
c8120d6d6a
Change-Id: Id709a812fc1db45e99a69a7114f2ff665b142cc2
Jovana Knezevic [Wed, 5 Jun 2019 01:15:17 +0000 (18:15 -0700)]
Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev
am:
e45e09fcee
Change-Id: I678920b9b4884ee648dc98e2777f313182df6ddd
Mady Mellor [Wed, 5 Jun 2019 01:13:51 +0000 (18:13 -0700)]
Merge "Post finishing after transition in onBackPressed" into qt-dev
am:
57854d3b90
Change-Id: I09189aa824b36a1de75a58515e2992b9b33e5e9b
Wale Ogunwale [Wed, 5 Jun 2019 01:12:27 +0000 (18:12 -0700)]
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev
am:
2aa255a746
Change-Id: Ib1b97e7a56015430a6d2599d1ed9bc77d1ef8d67
TreeHugger Robot [Wed, 5 Jun 2019 01:11:38 +0000 (01:11 +0000)]
Merge "Fix issue where panel opacity could be wrong" into qt-dev
Matt Casey [Wed, 5 Jun 2019 01:10:49 +0000 (18:10 -0700)]
Merge "Rendering fixes for assist handles." into qt-dev
am:
075baa2e9b
Change-Id: Id4d60a85fba3ba08516aada382285fc48ce89cdc
Lorenzo Colitti [Wed, 5 Jun 2019 01:08:11 +0000 (18:08 -0700)]
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
am:
e2fb127e41
Change-Id: I61adf4e9044143852592361d0da06c08b4c24245
Makoto Onuki [Wed, 5 Jun 2019 00:59:19 +0000 (17:59 -0700)]
Merge "Fix slow query log." into qt-dev
am:
dee07f5d7f
Change-Id: I5e123df7a020c65e718d16b487524ea80a35ddee
Alex Salo [Wed, 5 Jun 2019 00:50:14 +0000 (00:50 +0000)]
Merge "Don't call ActivityManagerService on main thread" into qt-dev
Mathieu Chartier [Wed, 5 Jun 2019 00:22:39 +0000 (00:22 +0000)]
Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 23:03:29 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 22:55:34 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Kevin Chyn [Tue, 4 Jun 2019 22:14:05 +0000 (22:14 +0000)]
Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev
Tracy Zhou [Tue, 4 Jun 2019 22:05:36 +0000 (22:05 +0000)]
Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev
Hui Yu [Tue, 4 Jun 2019 21:59:52 +0000 (21:59 +0000)]
Merge "Only set mStartClockTime when device is fully charged." into qt-dev
Bill Yi [Tue, 4 Jun 2019 21:44:42 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb522c4dcc354e5a984dd8cb6f7111fac4c5e8d2
TreeHugger Robot [Tue, 4 Jun 2019 21:38:33 +0000 (21:38 +0000)]
Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev
TreeHugger Robot [Tue, 4 Jun 2019 21:34:23 +0000 (21:34 +0000)]
Merge "Add system option to disable lock profiling" into qt-dev
Alex Salo [Thu, 30 May 2019 22:24:54 +0000 (15:24 -0700)]
Don't call ActivityManagerService on main thread
AttentionManagerService is getting called from PMS with its mLock held.
PowerManagerService can't up-call to the system, thus AMS can't call
into ActivityManagerService via bindService() - put it on another
thread.
Bug:
133077390
Test: manually
Change-Id: I373163c188bc8dbbd3d4f708073a875a57cfed73
Winson Chung [Tue, 4 Jun 2019 20:56:37 +0000 (20:56 +0000)]
Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev
Brad Ebinger [Thu, 30 May 2019 23:31:57 +0000 (16:31 -0700)]
Switch DDS during MSIM emergency call
Add carrier config to force DDS switch if device
does not support SUPL on non DDS for emergency and
also does not support control plane fallback.
Fixes:
131203278
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Robert Snoeberger [Tue, 4 Jun 2019 20:38:17 +0000 (20:38 +0000)]
Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev
Mathieu Chartier [Tue, 4 Jun 2019 20:11:16 +0000 (13:11 -0700)]
Fix some bugs in dumpsys meminfo attribution
ART image files can end with either .art or .art] depending on where
they are loaded from, add handling for this.
Also fix subheap attribution to HEAP_ART_BOOT and HEAP_ART_APP for
the app image case.
Test: adb shell dumpsys meminfo `pid system_server`
Bug:
134509632
Change-Id: I98882466d7c2f31179b095b803af67d21c17306c
Jovana Knezevic [Tue, 4 Jun 2019 20:10:43 +0000 (20:10 +0000)]
Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev
Hongyi Zhang [Tue, 4 Jun 2019 19:49:22 +0000 (12:49 -0700)]
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
am:
a1d0453641
Change-Id: I1ae1f1c463e21ab56106390e72030fd637bf45fc
Victor Hsieh [Tue, 4 Jun 2019 19:45:45 +0000 (12:45 -0700)]
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
am:
4fd5870662
Change-Id: I345eab0653feb3d6aa9d063315bbdcf0f9ca44ea
TreeHugger Robot [Tue, 4 Jun 2019 19:11:52 +0000 (19:11 +0000)]
Merge "Post finishing after transition in onBackPressed" into qt-dev
Wale Ogunwale [Tue, 4 Jun 2019 19:04:53 +0000 (19:04 +0000)]
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev
Lucas Dupin [Tue, 4 Jun 2019 18:40:42 +0000 (11:40 -0700)]
Fix issue where panel opacity could be wrong
Test: manual
Fixes:
133317529
Change-Id: I642df0999a9552be33f0385a42cbfcfb84bafaa1
Kevin Chyn [Tue, 4 Jun 2019 18:42:58 +0000 (11:42 -0700)]
Use real gatekeeper HAT for resetting lockout
The code is slightly confusing in that synthetic password response also
contains a gatekeeper response. This is not the actual response that
contains the challenge. Instead, we should be using the second response
from gateeper, which is the real gatekeeper auth token.
Fixes:
133444358
Test: Before change, get locked out, enter password, user stays locked out
After change, get locked out, enter password, lockout is reset
Change-Id: Ia869fe5d1ebdb91263b3494da2fba5f3c6304047
TreeHugger Robot [Tue, 4 Jun 2019 18:03:32 +0000 (18:03 +0000)]
Merge "Rendering fixes for assist handles." into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 18:00:31 +0000 (18:00 +0000)]
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
Govinda Wasserman [Tue, 4 Jun 2019 13:37:32 +0000 (09:37 -0400)]
Fixes timestamp passed to the Assistant
Test: Tested locally
BUG:
134204043
Change-Id: Ib7d94c3d548ede8cad4f9458b3cf361662ff239d
FIX:
134204043
Jorim Jaggi [Tue, 4 Jun 2019 17:51:45 +0000 (19:51 +0200)]
Do not hold lock when trying to get snapshot
Also never hit the disk for content suggestions, that doesn't
make any sense.
Test: Trace
Fixes:
134482630
Change-Id: Ie79da77152782973e1188e854fd6ebb3ca1df9cc
Winson Chung [Tue, 4 Jun 2019 17:25:50 +0000 (10:25 -0700)]
Expose keyguard showing-but-occluded state to launcher
Bug:
133871965
Test: Verify with sysui dump in various states
Change-Id: I39c99712d525e0823a86d32510beb0a35103dd5e
Lucas Dupin [Tue, 4 Jun 2019 17:25:43 +0000 (17:25 +0000)]
Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev
Wale Ogunwale [Tue, 4 Jun 2019 13:44:14 +0000 (13:44 +0000)]
Revert "Collect NeededUriGrants without holding locks."
This reverts commit
344ce7ce703f806f50ea253047d6dbbb10eaa424.
Bug:
115619667
Bug:
134494852
Reason for revert: Causes "Permission Denial: opening provider" error
Change-Id: I9986618b6e338fef9843b2103da6a728a36c6ea6
Makoto Onuki [Tue, 4 Jun 2019 16:57:23 +0000 (16:57 +0000)]
Merge "Fix slow query log." into qt-dev
Govinda Wasserman [Tue, 4 Jun 2019 16:57:07 +0000 (16:57 +0000)]
Merge "Refactors logging into its own function" into qt-r1-dev
Hongyi Zhang [Tue, 4 Jun 2019 16:47:35 +0000 (16:47 +0000)]
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 16:39:34 +0000 (16:39 +0000)]
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 16:30:35 +0000 (16:30 +0000)]
Merge "Update themed icons." into qt-r1-dev
junyulai [Tue, 4 Jun 2019 15:48:20 +0000 (08:48 -0700)]
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
am:
eabafd5ceb
Change-Id: Ic3003fa5482446f361faa01aec1b709e40954173
Matt Casey [Mon, 3 Jun 2019 17:59:47 +0000 (13:59 -0400)]
Rendering fixes for assist handles.
Compute the arc angle based upon a fixed distance along the perimeter.
If that angle exceeds 90 degrees, add "arms" extending from the 90
degree corner and lighten the stroke slightly.
Fixes corner display on small-radius phones.
Bug:
134487710
Fixes:
133834204
Test: Visual inspection with UX across several devices.
Change-Id: I6ce625d14bd7224114da311e54c86b87e92533a1
TreeHugger Robot [Tue, 4 Jun 2019 15:38:18 +0000 (15:38 +0000)]
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
Ryan Mitchell [Tue, 4 Jun 2019 15:14:36 +0000 (08:14 -0700)]
Merge "Fix atoi build errors" into qt-dev
am:
9fe4ba7a43
Change-Id: I64c88c9666c208e0e80919ea4fc3299a27d09c5b
TreeHugger Robot [Tue, 4 Jun 2019 15:06:08 +0000 (15:06 +0000)]
Merge "Fix atoi build errors" into qt-dev
Alan Stokes [Tue, 4 Jun 2019 14:37:55 +0000 (07:37 -0700)]
Cleanup background activity starts for release.
am:
9e2457622a
Change-Id: I9bc0682105251e2d462859560978763032b195c2
Lorenzo Colitti [Tue, 4 Jun 2019 05:37:26 +0000 (14:37 +0900)]
Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.
This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.
Bug:
130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
Michael Wright [Tue, 4 Jun 2019 14:26:25 +0000 (15:26 +0100)]
Uncanonicalize URIs when searching for audio-coupled haptics.
It's possible that the Ringtone URIs will be pre-canonicalized, which
don't maintain equality when compared to uncanonicalized URIs. In order
to handle this case, we just need to uncanonicalize both URIs before
comparing.
Fixes:
134394754
Test: manual, verified audio-coupled haptics works again on B1C1
Change-Id: I2e216db1013d5bc0db0a1622e0670853663f0db8
Alan Stokes [Tue, 21 May 2019 13:54:28 +0000 (14:54 +0100)]
Cleanup background activity starts for release.
This removes the parts of the feature that were only needed in beta
releases:
- Toast when a start is or would be blocked.
- Configurable whitelist of exempt apps.
- Global setting to disable.
Not to be submitted until after beta 5 is cut.
Bug:
131747138
Test: atest BackgroundActivityLaunchTest
Test: atest RootWindowContainerTests
Test: atest WmTests:ActivityStarterTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Test: atest CtsAppTestCases:.ServiceTest
Change-Id: I3d8b9c72c8fac86b93ac57a8a1988f4133043af8
Bill Yi [Tue, 4 Jun 2019 14:18:02 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie4cd11a6eda1033396c3cf7dc824128f580a4665
Robert Snoeberger [Mon, 3 Jun 2019 21:33:09 +0000 (17:33 -0400)]
Prevent clock-lock overlap with pulsing on AOD.
Bug:
133458665
Test: manual
Change-Id: I807577e52fdc372ba98114061f3c4bb533a0404d
Govinda Wasserman [Mon, 3 Jun 2019 16:37:43 +0000 (12:37 -0400)]
Refactors logging into its own function
This will allow logging behavior to be overridden.
Test: Tested locally
BUG:
128982146
Change-Id: Iaabc4ad0b44147732e05b4b9317e49bcee91683d
Steve Elliott [Tue, 4 Jun 2019 12:49:22 +0000 (05:49 -0700)]
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev
am:
b730e36596
Change-Id: If9eab4b100c80a50b9288fd3c47527c9058e3f8a
Steve Elliott [Tue, 4 Jun 2019 12:47:43 +0000 (05:47 -0700)]
Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev
am:
8b865cd7d9
Change-Id: I53b194c04f19d0d8b08026e30517d27576a8a36a
junyulai [Tue, 4 Jun 2019 12:26:38 +0000 (05:26 -0700)]
Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.
This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.
Bug:
134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
2. atest android.net.cts.ConnectivityManagerTest
3. atest FrameworksNetTests
4. atest FrameworksTelephonyTests
Merged-In: If630d5b339aa722717258c721daa8ead8c431e2d
Change-Id: Ic0f168be6f5a6263a5e0565b6381dcb5c645660f
(cherry picked from commit
9ede677bb2c081ccdc41c8c3c19c949114bcc138)
TreeHugger Robot [Tue, 4 Jun 2019 12:36:12 +0000 (12:36 +0000)]
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 12:35:42 +0000 (12:35 +0000)]
Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev
Amin Shaikh [Mon, 3 Jun 2019 19:58:02 +0000 (15:58 -0400)]
Update themed icons.
Fixes:
132808864
Fixes:
131238809
Test: mp droid; manually check icons
Change-Id: Idffc547c971c90031f14dc0b2fa1b6337586e61f
Alan Stokes [Tue, 4 Jun 2019 08:13:30 +0000 (01:13 -0700)]
Merge "Do not allow app to start background activity after stop app switches triggered" into qt-dev
am:
02d9b9c35b
Change-Id: Ib4c2d91a12be63cea87f3bee198c17965d217f93
Alan Stokes [Tue, 4 Jun 2019 07:46:52 +0000 (07:46 +0000)]
Merge "Do not allow app to start background activity after stop app switches triggered" into qt-dev
Ryan Mitchell [Tue, 4 Jun 2019 06:01:34 +0000 (23:01 -0700)]
Fix atoi build errors
Use strtol instead of atoi to check vendor partition version.
Bug:
119390857
Test: manual
Change-Id: I49c5963d8bbc5a803b3ccc0dd41d7bd7f2a42226
joshmccloskey [Fri, 31 May 2019 00:09:40 +0000 (17:09 -0700)]
Fixed talkback issue
Test: Flashed to device and verified that user can scroll past gray face
icon when accessibility mode is enabled.
Fixes:
132298701
Change-Id: I5412f21c8834118b15ef96bf8cf31d6c39326987
Lorenzo Colitti [Tue, 4 Jun 2019 04:21:09 +0000 (21:21 -0700)]
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
am:
f61e5f2410
Change-Id: Ifac7c0a43c42060ed73cbb07e8b83fcfb6b3922b
Lorenzo Colitti [Tue, 4 Jun 2019 04:21:07 +0000 (21:21 -0700)]
Revert "[DO NOT MERGE] Handle config override via settings correctly"
am:
69a015931e
Change-Id: I1e1dd514df630cd9c35f6af59108dfbe31de6a20
Lucas Dupin [Fri, 31 May 2019 21:36:42 +0000 (14:36 -0700)]
Disable bypass if there aren't enrolled faces
Bug:
130327302
Test: manual
Test: BiometricsUnlockControllerTest
Change-Id: I699bae45a2a9ce21bdca5a9ca177c97a91ba5f5a
Lucas Dupin [Tue, 4 Jun 2019 04:06:45 +0000 (04:06 +0000)]
Merge "Do not hide media metadata when bypassing LS" into qt-r1-dev
Lorenzo Colitti [Tue, 4 Jun 2019 03:57:07 +0000 (03:57 +0000)]
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
Yao Chen [Tue, 4 Jun 2019 03:38:49 +0000 (20:38 -0700)]
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
am:
6d647b78d3
Change-Id: I69258e0cb237f501e2962f216396889ec0521098
Yao Chen [Tue, 4 Jun 2019 03:31:15 +0000 (03:31 +0000)]
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
Lorenzo Colitti [Tue, 4 Jun 2019 03:18:12 +0000 (03:18 +0000)]
Revert "[DO NOT MERGE] Handle config override via settings correctly"
This reverts commit
aa5ba4f75ff8391ce14f8b357450ca4be98c589c.
Reason for revert: Breaks presubmits. Bootloops blueline on qt-dev.
Bug:
134445287
Change-Id: I6ad17fa66a1ddc681339966acd007ebd43d7ba3b
Matt Casey [Tue, 4 Jun 2019 02:51:49 +0000 (19:51 -0700)]
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
am:
5eab79db10
Change-Id: Ic01fff552325358e84743da927b1331d50a0f3d4
TreeHugger Robot [Tue, 4 Jun 2019 02:27:26 +0000 (02:27 +0000)]
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
Kevin Yao [Tue, 4 Jun 2019 01:40:43 +0000 (18:40 -0700)]
Merge "User education support on disambiguation dialog" into qt-dev
am:
327751f18f
Change-Id: I0ab37bd7b5cf4b00df4dc70d35a1387e3f348680
Winson Chung [Tue, 4 Jun 2019 01:38:38 +0000 (18:38 -0700)]
Merge "Fix regression in swiping up from lockscreen" into qt-dev
am:
fafe6dd571
Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b
Kevin Yao [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "User education support on disambiguation dialog" into qt-dev
OSDN Git Service
