Eric Laurent
|
1e52eafae1
|
Merge "audioservice: modify default music volume" into oc-dr1-dev am: b6f946c081
am: aebf79edb4
Change-Id: I9e5ee08c8320799dd53e604005c4be57142832fb
|
2017-07-12 17:47:33 +00:00 |
|
Eric Laurent
|
aebf79edb4
|
Merge "audioservice: modify default music volume" into oc-dr1-dev
am: b6f946c081
Change-Id: Ia13c9e28deba3ddd0b7ab74862d2febbf01f1142
|
2017-07-12 17:41:36 +00:00 |
|
TreeHugger Robot
|
d1e123cbad
|
Merge "Autofill: Add API for virtual view visibility"
|
2017-07-12 17:36:29 +00:00 |
|
TreeHugger Robot
|
b6f946c081
|
Merge "audioservice: modify default music volume" into oc-dr1-dev
|
2017-07-12 17:35:49 +00:00 |
|
Ningyuan Wang
|
a135b4b1cd
|
Merge "Document WifiScanner callback behaviors" into oc-dr1-dev am: 4a82979153
am: 9d6cd5674b
Change-Id: I7d1a27af523dde91b340519c7b8f1b3f2b6a97a1
|
2017-07-12 17:30:56 +00:00 |
|
Ningyuan Wang
|
9d6cd5674b
|
Merge "Document WifiScanner callback behaviors" into oc-dr1-dev
am: 4a82979153
Change-Id: I66871bfc1148c29fce78063d258911fbe85cba05
|
2017-07-12 17:24:40 +00:00 |
|
Tom Cherry
|
67958557a1
|
Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp
am: 5be9705588
Change-Id: I639678a11662e867bc62c6a18ca9f9725aae0c51
|
2017-07-12 17:21:03 +00:00 |
|
Geoffrey Pitsch
|
d13dfdf50f
|
Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev am: 7c9a6b502a
am: 804322ee01
Change-Id: I19c58b8be852ab0a705b02f02d0b712bfefd3458
|
2017-07-12 17:14:40 +00:00 |
|
TreeHugger Robot
|
4a82979153
|
Merge "Document WifiScanner callback behaviors" into oc-dr1-dev
|
2017-07-12 17:14:05 +00:00 |
|
Tom Cherry
|
5be9705588
|
Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp
|
2017-07-12 17:13:19 +00:00 |
|
Geoffrey Pitsch
|
804322ee01
|
Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev
am: 7c9a6b502a
Change-Id: I40ced751c59fbc10d0a23a3e06fe66cc59eafd17
|
2017-07-12 16:59:14 +00:00 |
|
Geoffrey Pitsch
|
7c9a6b502a
|
Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev
|
2017-07-12 16:50:53 +00:00 |
|
TreeHugger Robot
|
4ad301ad47
|
Merge "Count incorrect password attempts from shell."
|
2017-07-12 16:41:03 +00:00 |
|
Guliz Tuncay
|
6de678401f
|
Merge "TSMS updates settings properly in case of package changes"
|
2017-07-12 16:34:19 +00:00 |
|
Guliz Tuncay
|
7ef50770af
|
Merge "Clean up TSMS#setCurrentSpellCheckerLocked."
|
2017-07-12 16:33:02 +00:00 |
|
Android Build Merger (Role)
|
555b817670
|
Merge "Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21 am: 7776b49c13"
|
2017-07-12 16:15:31 +00:00 |
|
Neil Fuller
|
2f029ed26c
|
Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21
am: 7776b49c13
Change-Id: I0ae1025d7382ca0dca3cf69d7362df38898ee048
|
2017-07-12 16:14:00 +00:00 |
|
TreeHugger Robot
|
0bda0736e0
|
Merge "Update UCE service permissions' protection level from the old "signatureOrSystem" to "signature|privileged". Also: update some outdated protection level documentation in AndroidManifest.xml."
|
2017-07-12 16:13:51 +00:00 |
|
Neil Fuller
|
7776b49c13
|
Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac
am: 92189b6e21
Change-Id: I6b15cc75923cd712ca62302b8f797899ad43ad00
|
2017-07-12 16:07:03 +00:00 |
|
Erik Kline
|
2c354c3a1d
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460 am: b63707c0ca -s ours
am: 47fa2c5fa7 -s ours
Change-Id: I35053b8e32b7ec14f87627c6158993535d490155
|
2017-07-12 16:07:03 +00:00 |
|
Erik Kline
|
47fa2c5fa7
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460
am: b63707c0ca -s ours
Change-Id: I4910aa2c3e1284b0959d576af99fa1ef7a0071bf
|
2017-07-12 16:00:02 +00:00 |
|
Neil Fuller
|
92189b6e21
|
Merge "Address further API review comments" am: b279ec51b6
am: cf8e06c0ac
Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d
|
2017-07-12 15:59:57 +00:00 |
|
Erik Kline
|
b63707c0ca
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2
am: e5e3bdd460
Change-Id: I6e9bdfa3632ffa9abace5823c0982440f269a2c1
|
2017-07-12 15:53:04 +00:00 |
|
Neil Fuller
|
cf8e06c0ac
|
Merge "Address further API review comments"
am: b279ec51b6
Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775
|
2017-07-12 15:52:20 +00:00 |
|
Erik Kline
|
e5e3bdd460
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
am: b27c5e92a2
Change-Id: Ibb5f53e5e81c7969ae8edf73a42d11cd8505b0d4
|
2017-07-12 15:47:59 +00:00 |
|
Erik Kline
|
687e1ed932
|
Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev am: fcceb3ada4
am: a7534f20cd
Change-Id: I7c7675922a561a4642120df51715a550dab7f503
|
2017-07-12 15:40:00 +00:00 |
|
Treehugger Robot
|
b279ec51b6
|
Merge "Address further API review comments"
|
2017-07-12 15:37:40 +00:00 |
|
Treehugger Robot
|
b27c5e92a2
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
|
2017-07-12 15:36:18 +00:00 |
|
Erik Kline
|
a7534f20cd
|
Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
am: fcceb3ada4
Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
|
2017-07-12 15:32:58 +00:00 |
|
TreeHugger Robot
|
fcceb3ada4
|
Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
|
2017-07-12 15:23:04 +00:00 |
|
Evan Laird
|
3c3acf8bf1
|
Merge "Update keyguard mic icon to rounded" into oc-dr1-dev am: ea0beea5dd
am: ca07589a0a
Change-Id: I693532da82e2edba31069be1dd4ad257dec2c389
|
2017-07-12 15:17:16 +00:00 |
|
Evan Laird
|
76f21a2ab3
|
Merge "Update animations in QS" into oc-dr1-dev am: 497d73f35e
am: 11aba31e55
Change-Id: I466859df9f6b557060bb36eb3878896be438d9d1
|
2017-07-12 15:16:00 +00:00 |
|
Evan Laird
|
ca07589a0a
|
Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
am: ea0beea5dd
Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33
|
2017-07-12 15:07:38 +00:00 |
|
Evan Laird
|
11aba31e55
|
Merge "Update animations in QS" into oc-dr1-dev
am: 497d73f35e
Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7
|
2017-07-12 15:05:23 +00:00 |
|
Android Build Merger (Role)
|
796b7a56f9
|
Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998 am: e49c3675fe"
|
2017-07-12 14:59:33 +00:00 |
|
Erik Kline
|
5532099d8e
|
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998
am: e49c3675fe
Change-Id: Id089375a5699ac1157fc5f445876fee558d7bc7e
|
2017-07-12 14:58:27 +00:00 |
|
TreeHugger Robot
|
ea0beea5dd
|
Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
|
2017-07-12 14:58:20 +00:00 |
|
TreeHugger Robot
|
497d73f35e
|
Merge "Update animations in QS" into oc-dr1-dev
|
2017-07-12 14:58:04 +00:00 |
|
TreeHugger Robot
|
d5d183ea90
|
Merge "Fix Handler.Callback.handleMessage javadoc."
|
2017-07-12 14:57:48 +00:00 |
|
Erik Kline
|
e49c3675fe
|
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
am: 49a16f0998
Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
|
2017-07-12 14:51:35 +00:00 |
|
TreeHugger Robot
|
49a16f0998
|
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
|
2017-07-12 14:43:53 +00:00 |
|
Erik Kline
|
3e43de3ec0
|
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131
Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit 9a5b02a89c)
Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84
|
2017-07-12 23:25:27 +09:00 |
|
Erik Kline
|
5b3d97a8ab
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev am: 9df88e1fe7
am: 154bcbe518
Change-Id: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
|
2017-07-12 14:22:19 +00:00 |
|
Jorim Jaggi
|
a406ddd028
|
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda88
am: fb8e9add4b
Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3
|
2017-07-12 14:15:32 +00:00 |
|
Erik Kline
|
154bcbe518
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
am: 9df88e1fe7
Change-Id: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
|
2017-07-12 14:15:29 +00:00 |
|
Pavel Grafov
|
c07067d916
|
Count incorrect password attempts from shell.
Test: adb shell cmd lock_settings verify --user 10 --old 12368
and check device admin broadcast
Bug: 63295016
Change-Id: I19398eec9b324a061c4054d95dab12d047d501a5
|
2017-07-12 15:09:44 +01:00 |
|
Jorim Jaggi
|
fb8e9add4b
|
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am: f33b1eda88
Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b
|
2017-07-12 14:07:21 +00:00 |
|
TreeHugger Robot
|
9df88e1fe7
|
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
|
2017-07-12 14:06:52 +00:00 |
|
Lorenzo Colitti
|
a423292358
|
resolve merge conflicts of 5e7b01c823 to oc-dr1-dev-plus-aosp
am: dbdf7c1484
Change-Id: I29bff92b43e0662f11823c795036e41e51477017
|
2017-07-12 14:01:51 +00:00 |
|
Jorim Jaggi
|
f33b1eda88
|
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
|
2017-07-12 12:57:33 +00:00 |
|