Erik Kline
05cf335fc4
am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit '04159d0b8ea468947cdb349be007f99ba25baa92':
Change to connectivitycheck.gstatic.com
2015-07-27 05:59:10 +00:00
Erik Kline
04159d0b8e
am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit 'f0927733a31a95d88c32d2e41f40f1873361856b':
Change to connectivitycheck.gstatic.com
2015-07-27 05:40:12 +00:00
Erik Kline
f0927733a3
am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
Change to connectivitycheck.gstatic.com
2015-07-27 05:23:23 +00:00
Erik Kline
8c54a8e8c7
am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
...
* commit 'a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
Change to connectivitycheck.gstatic.com
2015-07-27 04:32:19 +00:00
Erik Kline
a7bdace262
Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
2015-07-27 02:35:09 +00:00
Geoff Mendal
87431eeac9
am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '08f5cd338566d5bab06003eadf29156bd6367690':
Import translations. DO NOT MERGE
2015-07-25 16:36:58 +00:00
Geoff Mendal
aec2c787a5
am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fab538f99b251c368b7c1f39453d9cd7553fad6d':
Import translations. DO NOT MERGE
2015-07-25 16:36:51 +00:00
Jeff Sharkey
43b379e72b
am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
...
* commit '43ff3afe1371cc8ec56754a1c06e7ed7573b770b':
Also check app-ops on path-permissions.
2015-07-25 16:36:43 +00:00
Selim Cinek
a69f853118
am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
...
* commit 'fd89d2a07a642aeb75930ba3595ee0be8795b360':
Fixed wake to unlock when the device has never been unlocked
2015-07-25 16:36:37 +00:00
Jorim Jaggi
9fd390c6b9
am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display
...
* commit '5efe21e4bfb585a4fb3759c9b5c13b6cf5caba81':
Fix ambient display
2015-07-25 16:36:30 +00:00
Adam Lesinski
6593daa39e
am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit 'a758499ee2c981eb2000661678860da68f2f9de2':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 16:36:22 +00:00
Selim Cinek
25fcf1994c
am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
...
* commit 'e756d912fe61a5894c686fcee943b3109cf6a5df':
Adapted the behavior when unlocking with fingerprint is not allowed
2015-07-25 16:36:17 +00:00
Chris Banes
0e23c2b7da
am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit '6331c6cacc7464d5bcbaa345499064e48e8a64cf':
v22.2.1 support api diff
2015-07-25 16:36:10 +00:00
Adrian Roos
c39e2a76d9
am 68db46ff: am 4fd4f4b4: am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI
...
* commit '68db46ffde5a7132fea92f8c5f98f5a77915cfa8':
Prevent insanely long passwords from crashing SystemUI
2015-07-25 16:36:03 +00:00
John Reck
2a5486090f
am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
...
* commit 'f43f6c5a05791adc9a3da745d88ddd17d2c81f5f':
Use process state to filter >= UI_HIDDEN
2015-07-25 16:35:57 +00:00
Geoff Mendal
08f5cd3385
am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '763611dd04396943b86f3877c68d482239e0a729':
Import translations. DO NOT MERGE
2015-07-25 16:14:50 +00:00
Geoff Mendal
fab538f99b
am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE
...
* commit '12d1d98905dae2731c8c598f3ae2f79d879648eb':
Import translations. DO NOT MERGE
2015-07-25 16:14:43 +00:00
Jeff Sharkey
43ff3afe13
am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
...
* commit '4c864be103a08411447e4595a7fd64a07f70c515':
Also check app-ops on path-permissions.
2015-07-25 16:14:36 +00:00
Selim Cinek
fd89d2a07a
am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
...
* commit '756d5ac2ed7bba9f4d2e7c95a627b0e449ef5334':
Fixed wake to unlock when the device has never been unlocked
2015-07-25 16:14:30 +00:00
Jorim Jaggi
5efe21e4bf
am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display
...
* commit '5b65bb1bc75ace94918690553993cf356014525e':
Fix ambient display
2015-07-25 16:14:24 +00:00
Adam Lesinski
a758499ee2
am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit 'd92a39574e3248b0493bfbf49366632141e6e180':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 16:14:17 +00:00
Selim Cinek
e756d912fe
am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
...
* commit 'd2e40fabcaddb9c32e0ddaaea8f45519a7d810d5':
Adapted the behavior when unlocking with fingerprint is not allowed
2015-07-25 16:14:11 +00:00
Chris Banes
6331c6cacc
am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit 'a62f3ee8595cac22db7fd67be7b41cbfdbd8baa5':
v22.2.1 support api diff
2015-07-25 16:14:04 +00:00
Adrian Roos
68db46ffde
am 4fd4f4b4: am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI
...
* commit '4fd4f4b476a085942c44259cdb1317f30077e804':
Prevent insanely long passwords from crashing SystemUI
2015-07-25 16:13:59 +00:00
John Reck
f43f6c5a05
am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
...
* commit 'aad38f60f8bede246b90b2e68004dac163ca88ef':
Use process state to filter >= UI_HIDDEN
2015-07-25 16:13:53 +00:00
Geoff Mendal
763611dd04
am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '16467c1db06eecb29d2ae5b334faf9dec7afc0ac':
Import translations. DO NOT MERGE
2015-07-25 15:55:33 +00:00
Geoff Mendal
12d1d98905
am 213e0c1d: (-s ours) Import translations. DO NOT MERGE
...
* commit '213e0c1daddb7a651335a484299bdebc77b9ab1c':
Import translations. DO NOT MERGE
2015-07-25 15:55:24 +00:00
Jeff Sharkey
4c864be103
am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
...
* commit '35f4b6a2460ef702bae604ca87b6c7a70f61c0f7':
Also check app-ops on path-permissions.
2015-07-25 15:55:04 +00:00
Selim Cinek
756d5ac2ed
am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
...
* commit 'e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029':
Fixed wake to unlock when the device has never been unlocked
2015-07-25 15:54:54 +00:00
Jorim Jaggi
5b65bb1bc7
am b6c6e45a: am f3255489: Fix ambient display
...
* commit 'b6c6e45a04a52a7ece08dd63636b1f71e7322653':
Fix ambient display
2015-07-25 15:54:50 +00:00
Adam Lesinski
d92a39574e
am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit 'eee604ff8bd76bc2a4f00b6612e92047bfe95d80':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 15:54:43 +00:00
Selim Cinek
d2e40fabca
am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
...
* commit '8588b3317c848e93998616c981f8c997197b4222':
Adapted the behavior when unlocking with fingerprint is not allowed
2015-07-25 15:53:57 +00:00
Chris Banes
a62f3ee859
am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit '67b4db0c5401ab81359fe145efcc91173154cae8':
v22.2.1 support api diff
2015-07-25 15:53:52 +00:00
Adrian Roos
4fd4f4b476
am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI
...
* commit '047b2bfd4fe19174ae3d8c79cd3767642d33f4ba':
Prevent insanely long passwords from crashing SystemUI
2015-07-25 15:53:45 +00:00
John Reck
aad38f60f8
am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
...
* commit '50aded0c8668b60953237813560b1cca8ccf6b66':
Use process state to filter >= UI_HIDDEN
2015-07-25 15:53:39 +00:00
Geoff Mendal
16467c1db0
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-07-25 11:52:57 +00:00
Geoff Mendal
a2217d6495
Import translations. DO NOT MERGE
...
Change-Id: I0e1bbb09bf26900df54dd55b5b9b8a320173a16f
Auto-generated-cl: translation import
2015-07-25 03:41:38 -05:00
Geoff Mendal
213e0c1dad
Import translations. DO NOT MERGE
...
Change-Id: Ic21adc47d8ff107c078aac141365b70289d9960c
Auto-generated-cl: translation import
2015-07-24 23:46:06 -07:00
Jeff Sharkey
35f4b6a246
am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
...
* commit '8be305dd6582f154c5a5894034a35fc8ec225b71':
Also check app-ops on path-permissions.
2015-07-25 02:20:25 +00:00
Jeff Sharkey
8be305dd65
Merge "Also check app-ops on path-permissions." into mnc-dev
2015-07-25 02:05:56 +00:00
Selim Cinek
e0c0e93a0f
am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
...
* commit 'd9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
Fixed wake to unlock when the device has never been unlocked
2015-07-25 01:54:26 +00:00
Jorim Jaggi
b6c6e45a04
am f3255489: Fix ambient display
...
* commit 'f325548992d449a2da564216191edb5ad2773bfd':
Fix ambient display
2015-07-25 01:54:21 +00:00
Selim Cinek
d9f1a0c3a4
Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
2015-07-25 01:48:16 +00:00
Jorim Jaggi
f325548992
Fix ambient display
...
Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.
Bug: 22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
2015-07-25 01:42:29 +00:00
Adam Lesinski
eee604ff8b
am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
...
* commit '2a493532e6ce44fd6dec07a22c3a016de80ccc46':
BatteryStats: Decode wakeup reasons in Java
2015-07-25 01:26:44 +00:00
Selim Cinek
ad7310f013
Fixed wake to unlock when the device has never been unlocked
...
Previously the fingerprint could still unlock the device
when waking up with the fingerprint sensor, since we were not
checking if it is allowed.
Bug: 22622999
Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47
2015-07-24 18:15:43 -07:00
Adam Lesinski
2a493532e6
Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
2015-07-25 01:14:07 +00:00
Andreas Gampe
e46c793ad3
am ac2c632f: am c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"
...
* commit 'ac2c632ff163e25adbc00ddc26e145c7ad5dd7a6':
Frameworks/base: Hand fingerprint to ART
2015-07-25 01:03:18 +00:00
Selim Cinek
8588b3317c
am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
...
* commit 'f8acd1d8d698f367bc267699a0a84c21f7c7d548':
Adapted the behavior when unlocking with fingerprint is not allowed
2015-07-25 00:59:57 +00:00
Chris Banes
67b4db0c54
am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
...
* commit 'c174de0ab353e2ecaf6e1728e6899bffcfefe48e':
v22.2.1 support api diff
2015-07-25 00:59:23 +00:00
