Jack Yu
08607194cf
am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
...
* commit '717e39df1c43806f3aa373f52c14f8b282f325b4':
Added a carrier config key for emergency messages on/off option always showing.
2015-09-16 21:13:23 +00:00
Jack Yu
717e39df1c
am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
...
* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
Added a carrier config key for emergency messages on/off option always showing.
2015-09-16 21:02:48 +00:00
Jack Yu
870a9e6a78
Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
2015-09-16 19:15:49 +00:00
Chris Tate
e46bf3f7f2
am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
...
* commit 'ee16be69f1c3b3a9d6cdcb8bde70be3f7a0dbb65':
Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:19:34 +00:00
Chris Tate
ee16be69f1
am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
...
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
Do not back up/restore the "pulse LED for notifications" setting
2015-09-16 17:11:19 +00:00
Chris Tate
3290f5dd06
Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev
2015-09-16 17:05:07 +00:00
Andres Morales
8d9ba68498
am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
...
* commit '5b78fda91e33b4fc8de5f0a8ab894941202c42cb':
reset lockout deadline on device reboot
2015-09-16 16:18:25 +00:00
Andres Morales
5b78fda91e
am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
...
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
reset lockout deadline on device reboot
2015-09-16 16:12:03 +00:00
Andres Morales
38e6e4ef98
Merge "reset lockout deadline on device reboot" into mnc-dr-dev
2015-09-16 16:04:56 +00:00
Zach Jang
ea196888a0
am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit 'e1ab0999cdcb719480200ea6be71a60f58ce90f4':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:32:04 +00:00
Zach Jang
d00737fc72
am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit 'eee9c2de434f89764b66dbe9dc7c8169971e5228':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:31:58 +00:00
Zach Jang
e1ab0999cd
am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit '2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:25:32 +00:00
Zach Jang
eee9c2de43
am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit '0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:25:28 +00:00
Zach Jang
2b564bf42a
am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit '716c6269674474867dc4720f86f739c639c83400':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:16:04 +00:00
Zach Jang
0098cbc011
am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit '971ff47c75889a2fc4ac710fbe62ba819feeaba6':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:16:00 +00:00
Zach Jang
716c626967
am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 02:06:31 +00:00
Zach Jang
971ff47c75
am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit '1b06455e44395489dcd027a170e68eabf2ebe1da':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 02:06:26 +00:00
Zach Jang
63348ae457
am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 01:56:57 +00:00
Zach Jang
1b06455e44
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 01:56:52 +00:00
Zach Jang
11317e82cf
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
...
* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
2015-09-16 01:44:58 +00:00
Zach Jang
00db082656
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
...
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
2015-09-16 01:44:53 +00:00
Zach Jang
32a420ea36
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev
2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
...
This reverts commit 3b49affdb3
2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
2015-09-16 01:37:36 +00:00
Lorenzo Colitti
5bc891c8a8
am 774adb03: am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
...
* commit '774adb03a30e0203bf2f4da29907d463799c33c3':
Framework fixes for RSSI offload.
2015-09-16 01:12:20 +00:00
Lorenzo Colitti
774adb03a3
am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev
...
* commit '7198c0aa4ccbeaecf2606006d3a6ace684f805fe':
Framework fixes for RSSI offload.
2015-09-16 01:01:05 +00:00
Lorenzo Colitti
7198c0aa4c
Merge "Framework fixes for RSSI offload." into mnc-dr-dev
2015-09-16 00:54:57 +00:00
Jim Miller
f84e0535ae
am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
...
* commit '0dd1163af00f16bc0e8e07cb585d4c217df78af3':
Add logging to track fingerprint reco but not unlocking
2015-09-15 21:31:22 +00:00
Guang Zhu
8bc9238f14
am 9e4a4606: am fe74fb95: extend svc command to control NFC state
...
* commit '9e4a4606b8ff1469b7fee96ba1daa220fe51b042':
extend svc command to control NFC state
2015-09-15 21:31:16 +00:00
Svet Ganov
4f5b020e87
am 51491627: am 276da47a: am cd946024: Default grant SMS and Phone to the verifier
...
* commit '51491627f4f191959ff34d4cff85171c1fc4cb8f':
Default grant SMS and Phone to the verifier
2015-09-15 21:31:09 +00:00
Christopher Tate
9cecf14783
Do not back up/restore the "pulse LED for notifications" setting
...
Bug 24103790
Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
2015-09-15 14:26:12 -07:00
Filip Gruszczynski
8d5f358dce
am 41e13b0a: Update circular mask after display is ready.
...
* commit '41e13b0a68e49648d2f58738880bc3d6f93201cf':
Update circular mask after display is ready.
2015-09-15 21:24:15 +00:00
Jim Miller
0dd1163af0
am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
...
* commit 'dca3b2f74f7979e87e2654baf83df42483ef4388':
Add logging to track fingerprint reco but not unlocking
2015-09-15 21:22:50 +00:00
Guang Zhu
9e4a4606b8
am fe74fb95: extend svc command to control NFC state
...
* commit 'fe74fb95b91a5d58a8d2d238c525e2f1891ca0c7':
extend svc command to control NFC state
2015-09-15 21:22:46 +00:00
Svet Ganov
51491627f4
am 276da47a: am cd946024: Default grant SMS and Phone to the verifier
...
* commit '276da47adf23b5512985268f36fab0b7d2d11363':
Default grant SMS and Phone to the verifier
2015-09-15 21:22:41 +00:00
Jim Miller
dca3b2f74f
Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev
2015-09-15 21:08:06 +00:00
Guang Zhu
fe74fb95b9
extend svc command to control NFC state
...
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
2015-09-15 13:43:22 -07:00
Filip Gruszczynski
41e13b0a68
Update circular mask after display is ready.
...
This fixes the situation where the circular mask is not applied because
the configuration is not reporting round screen. Configuration is
computed based on the display, so we can only depend on it having the
correct information after the display became ready.
Bug: 23689649
Bug: 23325855
Change-Id: I1e1fa307836f4053cfc4978da0239cb42c5af2c3
2015-09-15 13:17:44 -07:00
Svet Ganov
276da47adf
am cd946024: Default grant SMS and Phone to the verifier
...
* commit 'cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
Default grant SMS and Phone to the verifier
2015-09-15 20:10:30 +00:00
Zach Jang
3b49affdb3
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
...
This reverts commit 82b70db7dd
2015-09-15 20:09:52 +00:00
Lorenzo Colitti
6bc0a2b6f8
Framework fixes for RSSI offload.
...
1. When registering a NetworkCallback, only update RSSI
thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
thresholds if the request specified a signal strength.
3. Add logging.
Add logging.
Bug: 21405941
Bug: 23679346
Bug: 23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f
2015-09-15 16:00:39 +09:00
Lorenzo Colitti
3bb69facad
am 1d121b78: am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
...
* commit '1d121b783324e86f1cd06fb3de91a35cacf3903f':
NetworkDiagnostics: ping default router from all global addreses.
2015-09-15 02:56:03 +00:00
Lorenzo Colitti
1d121b7833
am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
...
* commit 'e1e97377d04ab6e5d069c85aba4226f47371e7c6':
NetworkDiagnostics: ping default router from all global addreses.
2015-09-15 02:46:36 +00:00
Lorenzo Colitti
e1e97377d0
Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev
2015-09-15 02:39:20 +00:00
Jim Miller
1adb4a7693
Add logging to track fingerprint reco but not unlocking
...
Bug 23940153
Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
2015-09-14 19:12:35 -07:00
Jack Yu
6af6c346ee
Added a carrier config key for emergency messages on/off option always showing.
...
Adding a carrier config key that allows carriers to show "Turn on Notifications"
checkbox in Settings->More->Emergency broadcasts setting menu. If this key
exists and is set to true, this checkbox will always show up regardless of
developer options turned on or not.
bug:23886750
Change-Id: I54dec5830653a0e27d7ee652effe572231f1e3bb
2015-09-14 16:56:32 -07:00
Vinod Krishnan
aae9c4ab35
am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev
...
* commit '74c3a0e7b42e11ccd8f427660825bf6b3e3a4afc':
Add some constants for Wear MNC Perms
2015-09-14 22:31:46 +00:00
Vinod Krishnan
74c3a0e7b4
Merge "Add some constants for Wear MNC Perms" into cw-e-dev
2015-09-14 22:23:25 +00:00
Sridhar Vashist
c350430490
am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
...
* commit '92a420eb184015f9bae2d189ef335f86af9cbcbb':
DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
2015-09-14 22:17:14 +00:00
Filip Gruszczynski
31f01e2f2a
am 4cc1553c: am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.
...
* commit '4cc1553c931e26efad17cc1a1b74b0a0d880f301':
Don't animate burn-in return when it wasn't applied.
2015-09-14 22:17:08 +00:00
