TreeHugger Robot
f46eb349ec
Merge "Follow slice API finalization"
2018-08-10 01:45:50 +00:00
TreeHugger Robot
9f61c62f35
Merge "Let new homepage accept injected tiles"
2018-08-10 01:45:34 +00:00
TreeHugger Robot
3468371e94
Merge "6/n: Add camera preview to FaceEnrollEnrolling"
2018-08-10 01:32:02 +00:00
jackqdyulei
5c5e3bbd0c
Refactor the BatteryInfo
...
Move the battery stats logic to background because it is time
consuming.
Bug: 112262502
Test: robotest still pass
Change-Id: I794bc82a4f1b5ae5a883c89d447116601a86558f
2018-08-09 18:03:18 -07:00
TreeHugger Robot
3ff5a32ce7
Merge "More task affnity clean up"
2018-08-10 00:43:43 +00:00
jackqdyulei
e39e8d7f93
Clean up obsolete battery settings files
...
Fixes: 112440820
Test: robotest still pass
Change-Id: I91e8a4094bb2077c7998ef663d5545e9a3e18d03
2018-08-09 17:24:55 -07:00
Fan Zhang
3541dcb040
Let new homepage accept injected tiles
...
Bug: 110405144
Test: robotests
Change-Id: Idaa60fad23bab0989cccf687fb3ea47b7d56d957
2018-08-09 17:12:47 -07:00
Jason Monk
fee23c456a
Follow slice API finalization
...
Test: build
Change-Id: I5671b180a949d5038f9a73caf84a6d266ef90cfa
2018-08-09 17:03:33 -07:00
Zhaoyu Su
dbe5c0cd51
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882 am: 2c23e6ab75
...
am: d8ba38975b
2018-08-09 16:59:12 -07:00
Zhaoyu Su
d8ba38975b
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882
...
am: 2c23e6ab75
2018-08-09 16:44:57 -07:00
Fan Zhang
de74112f62
More task affnity clean up
...
Change-Id: I0df4f897b0e8649add5d4e8360ec3b9b95c214fd
Fixes: 111213301
Test: manual
2018-08-09 16:34:31 -07:00
Malcolm Chen
06bf4e8aeb
Use new SubscriptionInfo constructor
...
Bug: 92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
2018-08-09 16:32:32 -07:00
Zhaoyu Su
2c23e6ab75
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a
...
am: b69559f882
2018-08-09 16:31:49 -07:00
Kevin Chyn
22b4edd79e
6/n: Add camera preview to FaceEnrollEnrolling
...
Bug: 112005540
Test: manual
Change-Id: Ie4f810dffecdec9731e20d5756854d9c9f420f4b
2018-08-09 16:25:58 -07:00
Zhaoyu Su
b69559f882
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
...
am: 44360bc96a
2018-08-09 16:20:45 -07:00
TreeHugger Robot
112301bc83
Merge "Add summary text for more top level setting tiles"
2018-08-09 22:55:49 +00:00
Doris Ling
b3677b5768
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours am: bea56da7d6 -s ours am: 8143665d70 -s ours
...
am: b3ad03f0ba
2018-08-09 15:45:17 -07:00
Doris Ling
b3ad03f0ba
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours am: bea56da7d6 -s ours
...
am: 8143665d70
2018-08-09 15:40:59 -07:00
Doris Ling
8143665d70
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours am: 2ef0e15b66 -s ours
...
am: bea56da7d6
2018-08-09 15:32:03 -07:00
Doris Ling
bea56da7d6
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943 -s ours
...
am: 2ef0e15b66
2018-08-09 15:26:36 -07:00
Doris Ling
2ef0e15b66
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
...
am: 62158f0943
2018-08-09 15:19:19 -07:00
TreeHugger Robot
62158f0943
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
2018-08-09 21:51:32 +00:00
Fan Zhang
f6747a2f44
Add summary text for more top level setting tiles
...
- Connected devices
- App & notifs
- Battery
Bug: 110405144
Test: robotests
Change-Id: Ife44f7c5165483a1bad903ce90a241108ab5da25
2018-08-09 14:38:52 -07:00
Treehugger Robot
44360bc96a
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
2018-08-09 21:37:17 +00:00
Doris Ling
6c00b94652
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours am: 8c84949c84 -s ours
...
am: 690a4a199c
2018-08-09 13:24:51 -07:00
Doris Ling
690a4a199c
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev am: 38b9504a41 -s ours
...
am: 8c84949c84
2018-08-09 13:17:12 -07:00
Doris Ling
8c84949c84
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
...
am: 38b9504a41
2018-08-09 13:08:34 -07:00
TreeHugger Robot
38b9504a41
Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
2018-08-09 19:47:07 +00:00
Doris Ling
44c1ea445a
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f am: 4a6da68af7 am: ce02bdc0cd
...
am: 4b770e9ac8
2018-08-09 12:30:58 -07:00
Doris Ling
735baab6d3
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517 am: ad04140966
...
am: 949e45c8af
2018-08-09 12:29:06 -07:00
Doris Ling
4b770e9ac8
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f am: 4a6da68af7
...
am: ce02bdc0cd
2018-08-09 12:21:38 -07:00
Doris Ling
949e45c8af
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517
...
am: ad04140966
2018-08-09 12:20:08 -07:00
Doris Ling
9751c5d864
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 am: 0f0147213e -s ours am: cfcfc6a677
...
am: f2335b6567
2018-08-09 12:19:05 -07:00
Doris Ling
f2335b6567
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 am: 0f0147213e -s ours
...
am: cfcfc6a677
2018-08-09 12:18:06 -07:00
Doris Ling
ce02bdc0cd
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053 am: 9245b98d0f
...
am: 4a6da68af7
2018-08-09 12:14:46 -07:00
Doris Ling
ad04140966
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10
...
am: d1146af517
2018-08-09 12:13:30 -07:00
Doris Ling
cfcfc6a677
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146
...
am: 0f0147213e
2018-08-09 12:11:59 -07:00
Doris Ling
a4be447514
[automerger skipped] Disable changing lock when device is not provisioned. am: 770f4abf9d
...
am: bedc0dce89
2018-08-09 12:11:58 -07:00
Doris Ling
4a6da68af7
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
...
am: 9245b98d0f
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
...
am: 78a7ee2f10
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f
...
am: cff5200146
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
...
am: 197a10b053
2018-08-09 12:02:34 -07:00
Doris Ling
78a7ee2f10
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
...
am: 528be61eeb
2018-08-09 12:00:42 -07:00
Doris Ling
bedc0dce89
Disable changing lock when device is not provisioned.
...
am: 770f4abf9d
2018-08-09 11:58:38 -07:00
Doris Ling
cff5200146
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
...
am: 3672a1fe7f
2018-08-09 11:58:38 -07:00
TreeHugger Robot
197a10b053
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86fd98908e7c73503445e59cd0b97e86fd98908e7c7cd0b97e86f
2018-08-09 18:43:34 +00:00
TreeHugger Robot
528be61eeb
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5c056ac3011782fc16dc4aaa67659a61b622b07bec624deaff5c056ac3011782fc16dc4aaa67659a6c624deaff5c056ac3011782fc16dc4c624deaff5c056ac3011c624deaff5
2018-08-09 18:34:12 +00:00
Pavel Grafov
f20e34167e
Respect per-user fingerprints on profiles with unified challenge.
...
When an app uses KeyguardManager.createConfirmDeviceCredentialIntent to ask
the user to confirm credentials, it first goes into ConfirmDeviceCredentialActivity
and then goes into ConfirmLockPattern/ConfirmLockPassword, that incorporates
a derivative of ConfirmDeviceCredentialBaseFragment to deal with the actual credential
and fingerprint checking.
There are two bits of logic that are changed:
1) ConfirmDeviceCredentialBaseFragment gets target user id from the intent,
then uses UserManager.getCredentialOwnerProfile to find the credential owner
user id. If the target user is a work profile with unified challenge,
profile owner will be primary user, otherwise it will be the same user.
When credential confirmation dialog is invoked via
KeyguardManager.createConfirmDeviceCredentialIntent, mUserId will already
correspond to credential owner because ConfirmDeviceCredentialActivity already
calls getCredentialOwnerUserId(), so real target user is not available.
With this CL ConfirmDeviceCredentialActivity doesn't query credential owner because
it will be handled later anyway.
2) Currently when confirming credentials for work profile with unified challenge
we use mEffectiveUserId (credential owner) for fingerprints, which is incorrect,
since fingerprints are per-user and primary profile fingerprints cannot unlock
work profile apps' auth-bound keys. With this CL work profile user is used for
fingerprints.
Bug: 111821299
Test: manual, tried ConfirmCredential sample app in both profiles
Test: manual, tried CA certificate installation in both profiles
Test: manual, tried separate work challenge
Change-Id: I074f773de1bd6207b01664f259bdd04766f32d41
2018-08-09 17:20:26 +01:00
TreeHugger Robot
27c9e13c92
Merge "Fix RequestPermissionActivity crash"
2018-08-09 15:58:56 +00:00
TreeHugger Robot
e46e3d1cc9
Merge "Replace LocalBluetoothAdapter with BluetoothAdapter"
2018-08-09 09:58:30 +00:00
