Adrian Roos
cb20f55415
am f83da111: am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'f83da11131cfa0069fd4d455a74379968a7772ee':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 01:22:25 +00:00
Jim Miller
c7506b3718
am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
Fix type-o in FingerprintManager documentation
2015-08-22 01:22:18 +00:00
Trevor Bunker
44f50b3604
am 421244f4: am b1dded03: am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
...
* commit '421244f4e369ac49d2f32a66c0a0c85c861c1b56':
Add support for new window orientation sensor.
2015-08-22 01:22:12 +00:00
Adrian Roos
e3b07451c3
resolved conflicts for merge of bcc26c02 to master
...
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
2015-08-21 18:08:58 -07:00
Chong Zhang
be1ad3bdcb
Merge "Move stack focus and resumed activity when moving a focused task"
2015-08-22 00:59:54 +00:00
Jorim Jaggi
4b27011c6d
am ab023c90: am a1415360: am 2021956a: am ab45a217: Make wake-and-unlock faster
...
* commit 'ab023c901598ffb478a78550874cb692217a82a8':
Make wake-and-unlock faster
2015-08-22 00:51:41 +00:00
Jorim Jaggi
ab03badef9
am ff35aa2e: am 60146356: am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions
...
* commit 'ff35aa2ec14fe17853bd4edacc7dd9171e8b32f3':
Fix fingerprint listening state race conditions
2015-08-22 00:51:35 +00:00
Adrian Roos
f83da11131
am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'b51e34c35f5ef979cfc8ea6b1dfec7fc97c15a9a':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 00:41:04 +00:00
Jim Miller
e271d91e5f
am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '7225af947233f506d40500ab30a8c93bd1a603a5':
Fix type-o in FingerprintManager documentation
2015-08-22 00:40:58 +00:00
Trevor Bunker
421244f4e3
am b1dded03: am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
...
* commit 'b1dded03df8eabf79ecbfe0771ab4ac76446e3bf':
Add support for new window orientation sensor.
2015-08-22 00:40:52 +00:00
Adrian Roos
bcc26c0201
am 69fd61cb: am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit '69fd61cb9a487e5993098c93113d86c4fb32c304':
Add StrongAuthTracker
2015-08-22 00:40:47 +00:00
Jorim Jaggi
ab023c9015
am a1415360: am 2021956a: am ab45a217: Make wake-and-unlock faster
...
* commit 'a1415360d739a382bde8efa2fdb9cce4a1e8c00e':
Make wake-and-unlock faster
2015-08-22 00:40:42 +00:00
Chong Zhang
02898359b9
Move stack focus and resumed activity when moving a focused task
...
Also do not force focus when moving an activity to a stack. Focus
will be moved if the task was in front before. Focus shouldn't
be moved if the task was background.
bug: 23041817
Change-Id: I8f15c51cd38fea8bd1845b5268a7f153c1476462
2015-08-21 17:40:38 -07:00
Jorim Jaggi
ff35aa2ec1
am 60146356: am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions
...
* commit '6014635635cf1b41319413fdd6984ae1207dc397':
Fix fingerprint listening state race conditions
2015-08-22 00:40:35 +00:00
Adrian Roos
b51e34c35f
am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'fb6f6f2490372f113698d9c8d09dae7f4991dec3':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 00:26:58 +00:00
Jim Miller
7225af9472
am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit 'c66a0db280d5b8f21e7335b964f13cf6b765f336':
Fix type-o in FingerprintManager documentation
2015-08-22 00:26:52 +00:00
Trevor Bunker
b1dded03df
am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
...
* commit 'e2fb50b21d67decc555b6f89dea1d56fe8ee6655':
Add support for new window orientation sensor.
2015-08-22 00:26:45 +00:00
Adrian Roos
69fd61cb9a
am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit 'a8bbebd426b554378cedf3d4e729cabd7e0caff9':
Add StrongAuthTracker
2015-08-22 00:26:39 +00:00
Jorim Jaggi
a1415360d7
am 2021956a: am ab45a217: Make wake-and-unlock faster
...
* commit '2021956a1c35dba2b88257dc4a8eed8fa0acd650':
Make wake-and-unlock faster
2015-08-22 00:26:31 +00:00
Jorim Jaggi
6014635635
am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions
...
* commit '83526e3bbdff8e8ca3f85616d0678eb5d00ae3b7':
Fix fingerprint listening state race conditions
2015-08-22 00:26:24 +00:00
Adrian Roos
fb6f6f2490
am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit '2c632c8831349d2c951c9addae05f080958f0604':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 00:17:39 +00:00
Jim Miller
c66a0db280
am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '1bbc2750bb58f397a0195540d50c44400c381441':
Fix type-o in FingerprintManager documentation
2015-08-22 00:17:22 +00:00
Trevor Bunker
e2fb50b21d
am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev
...
* commit 'fbcd78e6ed5cd0ba3c231aa412ad5b07dd2faa44':
Add support for new window orientation sensor.
2015-08-22 00:17:06 +00:00
Adrian Roos
a8bbebd426
am b5e47228: Add StrongAuthTracker
...
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
Add StrongAuthTracker
2015-08-22 00:16:48 +00:00
Jorim Jaggi
2021956a1c
am ab45a217: Make wake-and-unlock faster
...
* commit 'ab45a217b0002dcf586d529ab8581cacbbfc37e9':
Make wake-and-unlock faster
2015-08-22 00:16:34 +00:00
Jorim Jaggi
83526e3bbd
am 86bed406: Fix fingerprint listening state race conditions
...
* commit '86bed40605e407459496ee2bfdf6b8af1ae1a581':
Fix fingerprint listening state race conditions
2015-08-22 00:16:29 +00:00
Chris Craik
8adc30a805
Merge "Add static asserts around assumed-static skia enum values"
2015-08-21 23:09:24 +00:00
Chris Craik
f145029113
Merge "Fixup DisplayListCanvas jni variable names"
2015-08-21 23:09:09 +00:00
Chris Craik
71c10ee8be
Merge "Switch several enums to enum classes"
2015-08-21 23:08:39 +00:00
Chris Craik
b9ce116dac
Switch several enums to enum classes
...
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
2015-08-21 23:05:44 +00:00
Stephen Hines
d7ba5795be
am 3954d395: resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp
...
* commit '3954d39547c2580e712c0213681b488bf0eb2714':
Don't make bad RS API level recommendations.
2015-08-21 23:02:42 +00:00
Adrian Roos
2c632c8831
Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
2015-08-21 22:59:43 +00:00
Stephen Hines
3954d39547
resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp
...
Change-Id: Iaeae433481d4059162fa79f14a38f3cac9fe9db2
2015-08-21 15:57:56 -07:00
Filip Gruszczynski
1d4d5a6587
Merge "Split WMS.handleAppTransitionReadyLocked."
2015-08-21 22:41:33 +00:00
Chris Craik
216048ffb0
Add static asserts around assumed-static skia enum values
...
Protects assumptions around enums value built into LUTs
Change-Id: Ica0692e4309d50b4d3897e0f3f47809d14f786fe
2015-08-21 15:32:58 -07:00
Jim Miller
1bbc2750bb
am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
...
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
Fix type-o in FingerprintManager documentation
2015-08-21 22:11:30 +00:00
Stephen Hines
da1173f4e1
am 582d1668: Merge "Don\'t make bad RS API level recommendations."
...
* commit '582d16681bf46eb2f11c24132ffbcd9f7cc4b74d':
Don't make bad RS API level recommendations.
2015-08-21 22:08:37 +00:00
Jim Miller
74d9c2aad1
Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
2015-08-21 21:59:51 +00:00
Stephen Hines
582d16681b
Merge "Don't make bad RS API level recommendations."
2015-08-21 21:57:37 +00:00
Trevor Bunker
fbcd78e6ed
Merge "Add support for new window orientation sensor." into mnc-dr-dev
2015-08-21 21:14:00 +00:00
Chris Craik
86c03ca534
Fixup DisplayListCanvas jni variable names
...
Change-Id: I279833f5fe4525ebbab3330c5b36582560ca87e9
2015-08-21 14:05:06 -07:00
Chris Craik
655c5d4c70
Merge "Revert "Revert "Simplify TextureView draw path"""
2015-08-21 20:28:46 +00:00
Adrian Roos
1de8bcb1e5
Invoke strong auth callback and default strong auth expired to true
...
Split off from I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b.
The initial value did not matter previously because
a SystemUI crash triggered the boot logic and forced
a manual entry before fingerprint works.
Long term the timeout logic should be moved to StrongAuthTracker
so it can be shared with the trust agent implementation (currently
implemented by the trust agents themeselfes)
Bug: 22846469
Bug: 22115393
Change-Id: I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b
2015-08-21 13:28:01 -07:00
Adrian Roos
b5e4722891
Add StrongAuthTracker
...
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
Filip Gruszczynski
d970f54555
Split WMS.handleAppTransitionReadyLocked.
...
Not only some pieces can be split into smaller pieces, but it also
reveals some variables that can be removed or their scope narrowed.
Change-Id: I44c8c9a2535f857c666d5c4a521204e820dbc60b
2015-08-21 12:43:26 -07:00
Jorim Jaggi
ab45a217b0
Make wake-and-unlock faster
...
- Scrims: When dismissing Keyguard, don't wait until the next frame
to start the animation. Saves 16ms
- Scrims: Skip first frame, because it's completely black anyways.
Saves 16ms.
- Don't wait with navigation bar to show until the screen has turned
on. Window manager is blocked on DisplayPowerController anyways, so
the animation will exactly be started when the screen turns on. Fixes
some jank as well.
- Window manager: Don't wait for the window below Keyguard for draw
completion until turning on screen. Saves a lot of time depending on
how the app is behaving.
Bug: 23401557
Change-Id: I9734f9a12143f0e3c0647e9aa066831a29a6de63
2015-08-21 19:29:30 +00:00
Jorim Jaggi
86bed40605
Fix fingerprint listening state race conditions
...
When calling cancel() on the cancellation signal, it doesn't happen
immediately. Now, because of a state messup during boot, we go
through the sequence
startListeningForFingerprint
stopListeningForFingerprint
startListeningForFingerprint
However, the cancellation callback from stopListeningForFingeprint
happened AFTER the second startListeningForFingerprint, so we assumed
that fingerprint detection was not running anymore but in reality it
was - leading to weird states and all kinds of small state messups.
Introduce a state machine to track when we we called cancel but
waiting for the confirmation of FingerprintService in order to track
this properly.
Bug: 23380500
Change-Id: I403479fb749cf7c22b73611b69698e8b771777d0
2015-08-21 19:29:05 +00:00
Roozbeh Pournader
4bae2038cd
Merge "Cleanup android.text.TextUtils a little."
2015-08-21 19:04:29 +00:00
Tom Cherry
bbb74906be
am fe0fcf5c: am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"
...
* commit 'fe0fcf5cad75c6ba717a3d0a4ddb7c6bc656135d':
bundle init.rc contents with its service
2015-08-21 18:32:07 +00:00
Tom Cherry
fe0fcf5cad
am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"
...
* commit 'b9ac485a8e49a4db080bab8ea684a9b262215563':
bundle init.rc contents with its service
2015-08-21 18:24:35 +00:00