Mark Salyzyn
|
db15537e6e
|
resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
|
2017-01-11 08:30:17 -08:00 |
|
Neil Fuller
|
505d8262ab
|
resolve merge conflicts of 46c39f6c3640 to master
Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052
|
2017-01-11 16:15:13 +00:00 |
|
TreeHugger Robot
|
2d75264011
|
Merge "Fixes for FlashlightTile lifecycle"
|
2017-01-11 16:02:54 +00:00 |
|
Diego Perez
|
5becc4872f
|
Merge "Call onApplyWindowInsets after requestApplyWindowInsets"
|
2017-01-11 15:57:15 +00:00 |
|
Lenka Trochtova
|
c70ca2d8f2
|
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f am: 44a53bab46
am: aa369e5d19
Change-Id: Iac1ae24754e012d31341f3a2b6fec3c637180f8e
|
2017-01-11 15:48:30 +00:00 |
|
Mark Salyzyn
|
082a1721b5
|
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510
Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
|
2017-01-11 15:45:46 +00:00 |
|
Neil Fuller
|
261a1dcffd
|
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc
am: 75f84f2261
Change-Id: I5cf584048e1e2cde67c33d77e99cd181db4e8c82
|
2017-01-11 15:45:29 +00:00 |
|
Richard Uhler
|
832af67c1d
|
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd am: 4911e517ab
am: c662c1541b
Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632
|
2017-01-11 15:41:36 +00:00 |
|
Erik Kline
|
96ac5e685b
|
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e am: 305796276b
am: 1559d51f86
Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a
|
2017-01-11 15:40:27 +00:00 |
|
Mark Salyzyn
|
ef8ccc8510
|
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5
Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
|
2017-01-11 15:40:24 +00:00 |
|
Santos Cordon
|
88c43ef3ae
|
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: a00c235600
am: 27e121f27f
Change-Id: I527300ce4f4182c278a2e065f2e5a3c322c79433
|
2017-01-11 15:39:30 +00:00 |
|
Santos Cordon
|
e7da78b039
|
Add Brightness setting for VR Mode. am: d6a5660a2c
am: f85ab8306f -s ours
Change-Id: Iea1f7d32d9c478fd7b1e0477ec12d811d6bd0daf
|
2017-01-11 15:38:29 +00:00 |
|
Mark Salyzyn
|
6143cbf1e5
|
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991
Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
|
2017-01-11 15:35:19 +00:00 |
|
Mark Salyzyn
|
e7fcbcb991
|
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
|
2017-01-11 15:24:11 +00:00 |
|
Neil Fuller
|
46c39f6c36
|
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 am: 5be9960f66
am: d544a4c682
Change-Id: I9e2ee5c872aaa500378900962899672f318e294c
|
2017-01-11 15:13:08 +00:00 |
|
Lenka Trochtova
|
aa369e5d19
|
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f
am: 44a53bab46
Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276
|
2017-01-11 15:09:46 +00:00 |
|
Philipp Weiß
|
34cb734d49
|
Merge "Add ticker text for network logging notification"
|
2017-01-11 15:03:28 +00:00 |
|
Neil Fuller
|
d544a4c682
|
Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
am: 5be9960f66
Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd
|
2017-01-11 15:02:42 +00:00 |
|
Lenka Trochtova
|
44a53bab46
|
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
am: 345362c66f
Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6
|
2017-01-11 14:59:18 +00:00 |
|
Jorim Jaggi
|
d8f2268e3c
|
Merge "Clean up starting window to prepare for saved surfaces"
|
2017-01-11 14:58:50 +00:00 |
|
Neil Fuller
|
5be9960f66
|
Merge "Switch ConfigUpdater to the new version of timezone updater code"
am: 216303cdb6
Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55
|
2017-01-11 14:54:51 +00:00 |
|
Lenka Trochtova
|
345362c66f
|
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am: 0c1a4b6a97
Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2
|
2017-01-11 14:49:09 +00:00 |
|
Neil Fuller
|
216303cdb6
|
Merge "Switch ConfigUpdater to the new version of timezone updater code"
|
2017-01-11 14:46:47 +00:00 |
|
Jason Monk
|
861e09ade2
|
Fixes for FlashlightTile lifecycle
Change-Id: I690440465ef5312d77a279e73eaa22ccbdfbcd53
Fixes: 33861261
Test: runtest systemui
|
2017-01-11 09:41:05 -05:00 |
|
Treehugger Robot
|
0c1a4b6a97
|
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
|
2017-01-11 14:40:06 +00:00 |
|
Neil Fuller
|
75f84f2261
|
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794
am: 43d53395dc
Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b
|
2017-01-11 13:54:10 +00:00 |
|
Neil Fuller
|
43d53395dc
|
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
am: f4e236c794
Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
|
2017-01-11 13:48:14 +00:00 |
|
phweiss
|
d4a54bbfd1
|
Add ticker text for network logging notification
Set ticker text to title for accessibility.
Bug:31207965
Test: manual
Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9
|
2017-01-11 14:38:29 +01:00 |
|
Neil Fuller
|
f4e236c794
|
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
am: 649a89e524
Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd
|
2017-01-11 13:37:37 +00:00 |
|
Neil Fuller
|
649a89e524
|
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
|
2017-01-11 13:27:10 +00:00 |
|
Richard Uhler
|
c662c1541b
|
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd
am: 4911e517ab
Change-Id: I5fd04eb1e91d4ff590a195598566a85bbc00999f
|
2017-01-11 10:58:30 +00:00 |
|
Rubin Xu
|
b03bfe0ad6
|
Merge "Update active fingerprint group when switching profiles"
|
2017-01-11 10:56:24 +00:00 |
|
Richard Uhler
|
4911e517ab
|
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d
am: 5c5637e1bd
Change-Id: I27f00cca9b511d6950e12b59f179faae21f07147
|
2017-01-11 10:48:00 +00:00 |
|
Richard Uhler
|
5c5637e1bd
|
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am: 8582826f8d
Change-Id: If5d55f55d86c4e4711e36a7f517336fbdda96e3d
|
2017-01-11 10:37:33 +00:00 |
|
Treehugger Robot
|
8582826f8d
|
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
|
2017-01-11 10:28:18 +00:00 |
|
Erik Kline
|
1559d51f86
|
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
am: 305796276b
Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98
|
2017-01-11 08:48:33 +00:00 |
|
Richard Uhler
|
d670d58667
|
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Test: make, device boots, installed an app
Test: adb shell cmd package compile -m speed|speed-profile <app>
Bug: 33192586
Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859
|
2017-01-11 08:44:26 +00:00 |
|
Erik Kline
|
305796276b
|
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
am: d48902d37e
Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc
|
2017-01-11 08:42:55 +00:00 |
|
Erik Kline
|
d48902d37e
|
Merge "Prepare UpstreamNetworkMonitor for extraction"
am: f84e5e8f76
Change-Id: I4e4d525ff1dc23189e4ef6978a1980319d6b85f2
|
2017-01-11 08:38:00 +00:00 |
|
Erik Kline
|
f84e5e8f76
|
Merge "Prepare UpstreamNetworkMonitor for extraction"
|
2017-01-11 08:29:18 +00:00 |
|
Seigo Nonaka
|
88296d221b
|
Merge "Introduce full justification."
|
2017-01-11 08:24:08 +00:00 |
|
TreeHugger Robot
|
3b6bcfb65d
|
Merge "Require InputContentInfo.requestPermission()"
|
2017-01-11 06:30:22 +00:00 |
|
David Stevens
|
e97cac4962
|
Merge "Fix calculation of duration in AnimationSet"
|
2017-01-11 05:36:25 +00:00 |
|
Andreas Gampe
|
e19589fbe8
|
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1 am: e4cff36099
am: 3b51506c5c
Change-Id: I24e391d2cd7b9bff0808fc9355059b1b71bcba3e
|
2017-01-11 04:53:19 +00:00 |
|
Calin Juravle
|
569216aae0
|
Merge changes I5b94a8f0,Ie6cdd846,Ie6b5f5e6,Ib962edf6,I9d779b2d, ... am: 619d6282c3 am: 6d0b836562 am: 8ad84c5e70
am: 4b1548bd5a
Change-Id: I0aeb97b80a4d5b3eeb18c4a2ac7467c9035f700a
|
2017-01-11 04:50:28 +00:00 |
|
Calin Juravle
|
e604a8b01e
|
Add an extra debug flag to BackgroundDexOptimizer am: 3a2b7f7d59 am: 236477e86e am: f5d005b8c2
am: 5c451a64fd
Change-Id: I9260b16dbc9f070c158bb2afecb10f31c4c500f2
|
2017-01-11 04:49:33 +00:00 |
|
Calin Juravle
|
da1059ceb8
|
Some refactoring in BackgroundDexOptService. am: 95176bb18e am: 377cc26e3a am: e1a0a76381
am: a9d1bfadf0 -s ours
Change-Id: Iec487a8c0daf72f095ed4e51217bda2c00e7ce8d
|
2017-01-11 04:48:34 +00:00 |
|
Calin Juravle
|
4a3f3ee177
|
Do not try to resolve realpath in DexManager. am: b96dba9bad am: b8f31d8a85 am: d86ca1cd25
am: 6d90cdb03b
Change-Id: Ic5040d3de6d00629ff184a951b84a4ea6e491f9d
|
2017-01-11 04:47:40 +00:00 |
|
Calin Juravle
|
d21846f078
|
Log DexManager realpath errors only in debug mode. am: 271bacbf5c am: 42c7fc7f27 am: 46b323869f
am: 4b92117bf6 -s ours
Change-Id: Ibd3705e5a0e2469ae49a86b4b3471b63776c3523
|
2017-01-11 04:46:20 +00:00 |
|
Calin Juravle
|
adc1765c59
|
Record data about dex files use on disk am: 5a9094c1b6 am: dc10a3bdb0 am: ea1c34d45e
am: a9911290ed -s ours
Change-Id: I59409244cc1f6112dffab1e055ceae2dea32e78d
|
2017-01-11 04:45:05 +00:00 |
|