am: c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
am: 530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
am: 59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history
Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history
Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
Do not allow draw on top for App notification settings
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
Do not allow draw on top for App notification settings
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.
Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.
Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
1) FaceSettings now gets closed when it loses foreground. This prevents
A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
leaving FaceSettings with a stale HAT which prevents users from
enrolling or toggling elements that require the HAT.
B) generateChallenge has a timeout, which may already have been met
C) User may have forgotten FaceSettings was open and lost context. Thus
it makes no sense to show ConfirmLock* since the user may have no idea
why it's showing anymore.
2) FaceSettings now generatesChallenge in onResume. onCreate is too early
since again, FaceSettings can be launched via intent while on Keyguard.
Similarly, we must ensure that Settings's challenge is generated
late enough (e.g. when it actually gains foregroundness)
Fixes: 133440610
Fixes: 133498264
Test: Open face settings, confirm password, lock screen. After unlocking,
user needs to re-open face settings.
Test: Modify HAL/framework to show re-enroll notification
Tap re-enroll notificaton on keyguard
Delete and re-enroll in settings, successful
Test: FaceSettings enroll works accross orientation change
Test: Tapping enroll button doesn't cause challenge to be revoked
due to onStop()
Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
This reverts commit d59150eca6.
Bug: 133498264
Bug: 133440610
Reason for revert: Fixing in a different way
Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting
Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
