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
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
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
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
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
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
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
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
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
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
Selim Cinek
f8acd1d8d6
Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
2015-07-25 00:33:14 +00:00
Adrian Roos
d435253322
am cd647578: am 16b74922: am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
...
* commit 'cd64757831606e5c44decc1b2e17e9a9558b0cf1':
Fix janky add guest transition
2015-07-24 22:42:14 +00:00
Adrian Roos
cd64757831
am 16b74922: am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
...
* commit '16b7492240b92a81332e61680f51073da8af186c':
Fix janky add guest transition
2015-07-24 22:29:12 +00:00
Adrian Roos
16b7492240
am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
...
* commit 'b6c18ab8cc33b1e813b5e1d54441d7192da3bfec':
Fix janky add guest transition
2015-07-24 22:09:25 +00:00
Adrian Roos
b6c18ab8cc
am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev
...
* commit '4629f1c58c00480b0dbd5a541a26b703b0770bf4':
Fix janky add guest transition
2015-07-24 21:57:16 +00:00
Adrian Roos
4629f1c58c
Merge "Fix janky add guest transition" into mnc-dev
2015-07-24 21:42:46 +00:00
Amith Yamasani
54e9686d74
am 310fe847: am 8582f9f7: am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
...
* commit '310fe847dfd890f6da1f45942826d9eb712be82f':
Require permission for internal broadcast
2015-07-24 20:13:28 +00:00
Amith Yamasani
310fe847df
am 8582f9f7: am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
...
* commit '8582f9f7591382e360ff9c2e93ea29c3fe65efde':
Require permission for internal broadcast
2015-07-24 19:57:34 +00:00
Amith Yamasani
8582f9f759
am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
...
* commit '21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8':
Require permission for internal broadcast
2015-07-24 19:47:39 +00:00
Amith Yamasani
21b0b3ac43
am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev
...
* commit '2c5aeeaaaaa0e048817dd04d41ae9f396bb76fb6':
Require permission for internal broadcast
2015-07-24 19:31:59 +00:00
Amith Yamasani
2c5aeeaaaa
Merge "Require permission for internal broadcast" into mnc-dev
2015-07-24 19:12:16 +00:00
Fyodor Kupolov
9008192e35
am b02f646c: am 71b4c049: am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
...
* commit 'b02f646c850d02b00c379ccd445ad7d637c8c022':
Added ACCESS_COARSE_LOCATION permission for BT
2015-07-24 18:49:37 +00:00
Fyodor Kupolov
b02f646c85
am 71b4c049: am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
...
* commit '71b4c04944b3fc7baa5e607cfd31ebc8cfef1abc':
Added ACCESS_COARSE_LOCATION permission for BT
2015-07-24 18:33:37 +00:00
Fyodor Kupolov
71b4c04944
am f9e60801: am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
...
* commit 'f9e60801073d0d3339ba948934460b77aa5e936e':
Added ACCESS_COARSE_LOCATION permission for BT
2015-07-24 18:18:42 +00:00
Fyodor Kupolov
f9e6080107
am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
...
* commit 'a5e25f33a530eb76c7b0fb77111eeedd6bd1f879':
Added ACCESS_COARSE_LOCATION permission for BT
2015-07-24 18:03:12 +00:00
Fyodor Kupolov
a5e25f33a5
Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev
2015-07-24 17:54:14 +00:00
Julia Reynolds
f6a39adb1d
am e0afde9c: am ff42cce4: am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
...
* commit 'e0afde9cf959557cf0cdf76a376234ae029ad608':
Prevent lockscreen album art from flickering on metadata change.
2015-07-24 16:07:35 +00:00
Julia Reynolds
e0afde9cf9
am ff42cce4: am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
...
* commit 'ff42cce4be414e12fc0aac70b12e9f31a323d5f7':
Prevent lockscreen album art from flickering on metadata change.
2015-07-24 15:17:15 +00:00
Julia Reynolds
ff42cce4be
am e00ab550: am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
...
* commit 'e00ab550d2ab3fc539cf02a45f774c9bf68e585a':
Prevent lockscreen album art from flickering on metadata change.
2015-07-24 15:00:06 +00:00
Julia Reynolds
e00ab550d2
am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
...
* commit 'ea00f320ee9caad53d63a3eaaee2d4733c9dca50':
Prevent lockscreen album art from flickering on metadata change.
2015-07-24 14:47:43 +00:00
Julia Reynolds
ea00f320ee
Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev
2015-07-24 14:34:02 +00:00
Adrian Roos
86a87d27a0
am d30691e5: am caf526ef: am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
...
* commit 'd30691e577e1b0c0e91026c48d520dcbe9944bbd':
Disable Keyguard affordances before setup is completed
2015-07-24 04:06:58 +00:00
Jason Monk
17127a3cb6
am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
...
* commit '184044e499a36297e01ce6d3bd55b7c9026be178':
Fix emergency only when no sims
2015-07-24 04:05:42 +00:00
Julia Reynolds
cf533d1cf7
am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
...
* commit '969bc9f7da19cb429ca850fe6205a9a9b48e1c6d':
Set 'the' media notification to the notification actually playing.
2015-07-24 04:05:35 +00:00
Jorim Jaggi
48692f6e19
am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS
...
* commit 'dd0b42d42dab9b0f48719d56d69f47a2e7a3f8cd':
Make sure expandingFinished gets called when going into QS
2015-07-24 04:05:29 +00:00
Adrian Roos
9e80d47039
am 6b32c53b: am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
...
* commit '6b32c53bcf45239dd5c81d2e48b50e1379294897':
Fix cut off charging indication in certain scripts
2015-07-24 04:03:40 +00:00
Adrian Roos
b6527cd6e8
am 32e8de05: am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
...
* commit '32e8de05fc6b891f99f6e7d893c506fdaeab9dbc':
Protect demo mode commands with permission
2015-07-24 04:02:56 +00:00
Chris Wren
3a66153f2a
am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit '99547e494a832d2b9d87ce13573150495e6ba3f8':
Don't crash sysui when advisory calls fail.
2015-07-24 04:02:17 +00:00
Jason Monk
bb8b0368c5
am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 04:01:38 +00:00
Adrian Roos
d30691e577
am caf526ef: am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
...
* commit 'caf526eff1892a2f18659da2bb948a0643fd580f':
Disable Keyguard affordances before setup is completed
2015-07-24 03:39:19 +00:00
Jason Monk
184044e499
am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
...
* commit '42caf39947e9f90834deb1aba251ee45c85d6045':
Fix emergency only when no sims
2015-07-24 03:38:09 +00:00
Julia Reynolds
969bc9f7da
am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
...
* commit '0aea721db2663e658b074a8374d8e17f29deb38c':
Set 'the' media notification to the notification actually playing.
2015-07-24 03:38:03 +00:00
Jorim Jaggi
dd0b42d42d
am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS
...
* commit 'c7dea8b38fd35779776156dd59b1631aca4e02fe':
Make sure expandingFinished gets called when going into QS
2015-07-24 03:37:54 +00:00
Adrian Roos
6b32c53bcf
am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev
...
* commit '06913a539b80b0a93b34dc4befad9ea30eb82cdb':
Fix cut off charging indication in certain scripts
2015-07-24 03:36:23 +00:00
Adrian Roos
32e8de05fc
am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev
...
* commit '81c6a311fd2e6c5326a85deb638af7f861e7605c':
Protect demo mode commands with permission
2015-07-24 03:35:51 +00:00
Chris Wren
99547e494a
am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev
...
* commit 'b86df334f778eecbf4beaaa9127e7e523e55fb6c':
Don't crash sysui when advisory calls fail.
2015-07-24 03:35:13 +00:00
Jason Monk
dea13a9623
am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev
...
* commit 'c063146fb2de35908183a52b2ff50934ad40c653':
Add metrics to tuner
Move tuner enable point to QS
2015-07-24 03:34:32 +00:00
Adrian Roos
caf526eff1
am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
...
* commit '9e289b05453f40f1e5855a972a53eaff92fe5268':
Disable Keyguard affordances before setup is completed
2015-07-24 03:12:08 +00:00
Jason Monk
42caf39947
am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
...
* commit 'e648ccbbf79924316cbf1da328e83cf23cd1de72':
Fix emergency only when no sims
2015-07-24 03:10:23 +00:00
Julia Reynolds
0aea721db2
am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev
...
* commit '9bef274ce9a00bcbc693c933dc3806b5ea36f44b':
Set 'the' media notification to the notification actually playing.
2015-07-24 03:10:00 +00:00
