OSDN Git Service
Tyler Gunn [Thu, 24 Aug 2017 15:18:01 +0000 (15:18 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev am:
ac3c798ab5
am:
6cca8ade9e
Change-Id: I913b1e2986d91d523442679f3e724dafb309b128
Tyler Gunn [Thu, 24 Aug 2017 15:06:22 +0000 (15:06 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
am:
ac3c798ab5
Change-Id: I80a22e7fdb0272313c8d9f98b6360c6d235e37ac
Tyler Gunn [Thu, 24 Aug 2017 15:01:52 +0000 (15:01 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
Jack He [Thu, 24 Aug 2017 13:50:48 +0000 (13:50 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev am:
34eac2c59b
am:
10edd06b15
Change-Id: Ieb0ac6a65d7e56b074832f3909f9becbc5012b5b
Jorim Jaggi [Thu, 24 Aug 2017 13:38:45 +0000 (13:38 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev am:
f1ef6ef742
am:
2b99571564
Change-Id: Iae4b6dd49ba82cff1ba17b0d1265a085e1ad459e
Jack He [Thu, 24 Aug 2017 13:35:19 +0000 (13:35 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
am:
34eac2c59b
Change-Id: I9ccc78cf03a37f80d3ba10408050a0b847bc2c7a
TreeHugger Robot [Thu, 24 Aug 2017 13:29:28 +0000 (13:29 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
Jorim Jaggi [Thu, 24 Aug 2017 13:26:16 +0000 (13:26 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
am:
f1ef6ef742
Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11
Jorim Jaggi [Thu, 24 Aug 2017 13:19:42 +0000 (13:19 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 13:06:13 +0000 (13:06 +0000)]
Merge "Expand the animation from the user's last touch point"
Narayan Kamath [Thu, 24 Aug 2017 11:37:39 +0000 (11:37 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev am:
0d9c30cf88
am:
95477fe682
Change-Id: Ib4799af8021787d8d52e159bf9edb0da5f006b6f
Narayan Kamath [Thu, 24 Aug 2017 11:27:31 +0000 (11:27 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
am:
0d9c30cf88
Change-Id: Ib8e91584604ab4abf46c53b35aa2b6be70a23f8a
TreeHugger Robot [Thu, 24 Aug 2017 11:18:31 +0000 (11:18 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
Lorenzo Colitti [Thu, 24 Aug 2017 11:17:28 +0000 (11:17 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev am:
9487f80cc5
am:
06e3e912b2
Change-Id: I335fdb5f3053569036608300f8a324a840517cde
Lorenzo Colitti [Thu, 24 Aug 2017 11:03:38 +0000 (11:03 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
am:
9487f80cc5
Change-Id: Iad2aad7163aea9b1b92ed3f46be7ce36cd0578c6
TreeHugger Robot [Thu, 24 Aug 2017 10:55:20 +0000 (10:55 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
Alexandru-Andrei Rotaru [Thu, 24 Aug 2017 10:29:43 +0000 (10:29 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev am:
afe28cdf7e
am:
83f6c7f7a6
Change-Id: I0dcc005d46e562afdf329c1dd57c985e4ce651ea
Alexandru-Andrei Rotaru [Thu, 24 Aug 2017 10:17:37 +0000 (10:17 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am:
afe28cdf7e
Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09
TreeHugger Robot [Thu, 24 Aug 2017 10:08:15 +0000 (10:08 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
Jack He [Mon, 24 Jul 2017 21:55:59 +0000 (14:55 -0700)]
Bluetooth: Add flag for human readable name
* Add hasHumanReadableName() method to CachedBluetoothDevice that
returns True when BluetoothDevice.getAliasName() is not null nor empty
Bug:
34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: I197f3f7f3bcb7d785729473b25638006449ae862
Jack He [Thu, 24 Aug 2017 08:59:22 +0000 (08:59 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev am:
cb065bc33e
am:
ac2afd4e78
Change-Id: Ia37942f5cc750f6e605aa7b9091a51298dc2af0a
Jack He [Thu, 24 Aug 2017 08:45:07 +0000 (08:45 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
am:
cb065bc33e
Change-Id: I089e0f69629666d21bc401c2191341a71d7c3172
TreeHugger Robot [Thu, 24 Aug 2017 08:34:39 +0000 (08:34 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 08:28:16 +0000 (08:28 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
767ca11384 -s ours
am:
2fd6220a26 -s ours
Change-Id: Ia3a8f2434e6edb2795ac67ce363f6d4bcde75c00
TreeHugger Robot [Thu, 24 Aug 2017 08:25:01 +0000 (08:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 24 Aug 2017 08:15:23 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
e7527d1334 -s ours" into oc-mr1-dev-plus-aosp
am:
16bead770e -s ours
Change-Id: I54b6025846fa5f52d3a321da165ca7685c147526
Bill Yi [Thu, 24 Aug 2017 08:10:53 +0000 (08:10 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
767ca11384 -s ours
Change-Id: I6a46c18871f77a0f97c2498dc1595bd29e1e6575
Bill Yi [Thu, 24 Aug 2017 08:09:55 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
0309d32f3e -s ours
am:
714c11a3ab -s ours
Change-Id: Ieed45f0cae6f1236b316700fba936a61fad7df01
Android Build Merger (Role) [Thu, 24 Aug 2017 08:07:04 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
e7527d1334 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 08:03:28 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
e7527d1334 -s ours
Change-Id: Id460576d6660c50202833d7eab6152c45213951a
Bill Yi [Thu, 24 Aug 2017 07:58:50 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
0309d32f3e -s ours
Change-Id: I3982df3278279f1debb6b2e578393edbc37b356a
Bill Yi [Thu, 24 Aug 2017 07:54:49 +0000 (07:54 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81
TreeHugger Robot [Thu, 24 Aug 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 07:50:24 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I0b3cf2e8204f78f342754b06988bd63344e72fa7
Erik Kline [Thu, 24 Aug 2017 06:09:40 +0000 (06:09 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1 am:
df2a880775 am:
64f6edc7fa -s ours
am:
04c8a76c96 -s ours
Change-Id: Ic0fc4059894126248e00a46d8cefe13efa8a1f6f
Erik Kline [Thu, 24 Aug 2017 05:56:56 +0000 (05:56 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1 am:
df2a880775
am:
64f6edc7fa -s ours
Change-Id: I604ec95dec7466831a29526217308bb869326229
Erik Kline [Thu, 24 Aug 2017 05:44:58 +0000 (05:44 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1
am:
df2a880775
Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872
Erik Kline [Thu, 24 Aug 2017 05:33:44 +0000 (05:33 +0000)]
Merge changes from topic "offload_cherrypick"
am:
b09cf3fbf1
Change-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de
Winson Chung [Thu, 24 Aug 2017 05:24:48 +0000 (05:24 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev am:
3a02835a02
am:
82ff58e40e
Change-Id: I12a79c551d45acad5e701a4e727f67ffb4051fa4
Treehugger Robot [Thu, 24 Aug 2017 05:18:23 +0000 (05:18 +0000)]
Merge changes from topic "offload_cherrypick"
* changes:
Send add/removeDownstream info to offload HAL
Don't completely stop offload if setting data limit fails.
Sundeep Ghuman [Thu, 24 Aug 2017 05:12:45 +0000 (05:12 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev am:
f563cc5a5a
am:
995223c977 -s ours
Change-Id: I4de149cf99e7aa2d6a4d8baf8787d47abd157e94
Winson Chung [Thu, 24 Aug 2017 05:12:43 +0000 (05:12 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev
am:
3a02835a02
Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c
Sundeep Ghuman [Thu, 24 Aug 2017 05:01:23 +0000 (05:01 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev
am:
f563cc5a5a
Change-Id: I2fb9fd06d77023c814d3dedc4ca4cc653ae4cd01
Justin Klaassen [Thu, 24 Aug 2017 05:01:13 +0000 (05:01 +0000)]
Merge "Support l11n of Qualcomm aptX strings" into oc-mr1-dev am:
b1bd840924
am:
62a96b2ed5
Change-Id: I390876729aaace8639a3d78effa975707d75eba1
TreeHugger Robot [Thu, 24 Aug 2017 05:00:48 +0000 (05:00 +0000)]
Merge "Move PiP state check exception to the client side" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 04:50:47 +0000 (04:50 +0000)]
Merge "Implement score cache eviction in AccessPoint." into oc-mr1-dev
Justin Klaassen [Thu, 24 Aug 2017 04:50:13 +0000 (04:50 +0000)]
Merge "Support l11n of Qualcomm aptX strings" into oc-mr1-dev
am:
b1bd840924
Change-Id: Ibc7eed03b814ae725c9a86bca16be6c3f5c70141
TreeHugger Robot [Thu, 24 Aug 2017 04:41:01 +0000 (04:41 +0000)]
Merge "Support l11n of Qualcomm® aptX™ strings" into oc-mr1-dev
Hugo Benichi [Thu, 24 Aug 2017 04:21:14 +0000 (04:21 +0000)]
Merge "Make NetworkManagementServiceTest pass again." am:
29b1826ff2 am:
d3d6ddea94 am:
c933ef6c54
am:
dceef06841
Change-Id: I5ec6a8cc3422c1baf107c814f7a60b28fcc71cd5
Jack He [Mon, 24 Jul 2017 19:30:08 +0000 (12:30 -0700)]
CachedBluetoothDevice: Rename mVisible to mJustDiscovered
* CachedBluetoothDevice's member mVisible does not mean whether the
device is visible. Instead, based on its current usage in the library,
it indicates whether the device was just discovered by SettingsLib.
* Rename the field to mJustDiscovered and associated setters and
getters.
* This paves way for future addition of mVisible to indicate whether the
device should be visible to user in the UI.
Bug:
34685932
Test: build only, no functional changes
Change-Id: I616904e6d5bb27dbae74f94819eb0e8607a16e20
Hugo Benichi [Thu, 24 Aug 2017 04:09:14 +0000 (04:09 +0000)]
Merge "Make NetworkManagementServiceTest pass again." am:
29b1826ff2 am:
d3d6ddea94
am:
c933ef6c54
Change-Id: Ic39262b1f650695cc6903c3a9e2ddb592d47b365
Hugo Benichi [Thu, 24 Aug 2017 03:57:38 +0000 (03:57 +0000)]
Merge "Make NetworkManagementServiceTest pass again." am:
29b1826ff2
am:
d3d6ddea94
Change-Id: I3bd2e7242a8100590311cca40369adf45b06e52f
Erik Kline [Thu, 6 Jul 2017 10:49:35 +0000 (19:49 +0900)]
Send add/removeDownstream info to offload HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Merged-In: I7abcdcc2d7d967179c47081a6db2b417164891f3
Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74
(cherry picked from commit
ed962a84122ab950a103fbbc0bf911f61b6b9500)
Lorenzo Colitti [Mon, 21 Aug 2017 03:34:50 +0000 (12:34 +0900)]
Don't completely stop offload if setting data limit fails.
Currently, if setting a data limit fails, we completely stop
offload in order to avoid data overages. However, the next thing
we do is try to fetch the stats and crash, because once offload
is stopped all our local state is cleared.
Fix this by fetching stats before we stop offload.
Bug:
29337859
Bug:
32163131
Bug:
64867836
Test: OffloadControllerTest passes
Test: no crash when disabling wifi tethering with BT tethering active
Merged-In: I7fc47e60b2da5f39c26fb22c1325618f9948dd38
Merged-In: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569
Change-Id: I260f5450f8b67f055983af68fb23a5f3cfc0bc69
(cherry picked from commit
d743601a002ac12c02da58e92ebd0544ab0b77ea)
Hugo Benichi [Thu, 24 Aug 2017 03:46:07 +0000 (03:46 +0000)]
Merge "Make NetworkManagementServiceTest pass again."
am:
29b1826ff2
Change-Id: If7fafa0922fdbc499c0c911a3f88ede9c8a26c1d
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iea41c2b50502797f559afd09ded8cedf50dd7c05
Winson Chung [Thu, 24 Aug 2017 03:42:38 +0000 (03:42 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev am:
270cee0bc2
am:
a5dc378503
Change-Id: Ia73b7422fa693ca566ffcef267018ebd18f8e473
Hugo Benichi [Thu, 24 Aug 2017 03:36:20 +0000 (03:36 +0000)]
Merge "Make NetworkManagementServiceTest pass again."
Winson Chung [Thu, 24 Aug 2017 03:31:11 +0000 (03:31 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev
am:
270cee0bc2
Change-Id: Id70dab5ec07d17a8e88205c157f25ff352c5bcb6
Hugo Benichi [Thu, 24 Aug 2017 03:27:16 +0000 (03:27 +0000)]
Merge "Tethering offload stats updates are eventually consistent" am:
ff12ba9376 am:
bbadcfd315 am:
3d2bf1a5e7 -s ours
am:
d0ec000008 -s ours
Change-Id: Id407d50935e5dbdd8a6d545694932dfe84f55aa1
Winson Chung [Thu, 24 Aug 2017 03:23:43 +0000 (03:23 +0000)]
Merge "Fix issue with resizing background and incorrectly outline." into oc-mr1-dev
Hugo Benichi [Thu, 24 Aug 2017 03:14:47 +0000 (03:14 +0000)]
Merge "Tethering offload stats updates are eventually consistent" am:
ff12ba9376 am:
bbadcfd315
am:
3d2bf1a5e7 -s ours
Change-Id: Ie4353e3dcd3d9be4e8ff0d8f4e6daf96362eadc6
Bill Yi [Thu, 24 Aug 2017 03:13:10 +0000 (20:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ifc65484d51405de737a5b269fe6b6036638d0df1
Hugo Benichi [Thu, 24 Aug 2017 03:02:47 +0000 (03:02 +0000)]
Merge "Tethering offload stats updates are eventually consistent" am:
ff12ba9376
am:
bbadcfd315
Change-Id: I3ad83ee73bded3b3987bbc86d776852e6ef20f28
Bill Yi [Thu, 24 Aug 2017 03:01:50 +0000 (20:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ia19cd901c16c37d3053afc81aa47cf2dff5bbeea
Hugo Benichi [Thu, 24 Aug 2017 02:52:42 +0000 (02:52 +0000)]
Merge "Tethering offload stats updates are eventually consistent"
am:
ff12ba9376
Change-Id: I3a8ddc928b60c666faab2991defe8fb7afd0801e
Bill Yi [Thu, 24 Aug 2017 02:44:31 +0000 (19:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia02eaebf3fe3fc6bafcdd90db612ec9a8963be6f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Thu, 24 Aug 2017 02:37:03 +0000 (02:37 +0000)]
Merge "Tethering offload stats updates are eventually consistent"
Android Build Merger (Role) [Thu, 24 Aug 2017 02:11:53 +0000 (02:11 +0000)]
Merge "Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev am:
5c53c6c6f5 am:
366f83c9d3"
TreeHugger Robot [Thu, 24 Aug 2017 02:09:50 +0000 (02:09 +0000)]
Merge "Enable accessibilityLiveRegion for TimePicker text input mode."
Winson Chung [Thu, 24 Aug 2017 02:08:31 +0000 (02:08 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev am:
5c53c6c6f5
am:
366f83c9d3
Change-Id: Ieb6b7367345eee2c58a8d3c568167424c5fa967f
Beverly Tai [Thu, 24 Aug 2017 02:01:16 +0000 (02:01 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev am:
a2dbf80a13
am:
4c1718a3ca
Change-Id: I438f68c533493da2577b02efac4781c51fd40746
TreeHugger Robot [Thu, 24 Aug 2017 01:56:53 +0000 (01:56 +0000)]
Merge "Implement score cache eviction in AccessPoint."
Winson Chung [Thu, 24 Aug 2017 01:48:34 +0000 (01:48 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
am:
5c53c6c6f5
Change-Id: I06c3ae928d8008ec5afd04acb4ad439736933606
Erik Kline [Thu, 24 Aug 2017 01:44:31 +0000 (01:44 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev am:
568cd41216
am:
7559e2d2b2
Change-Id: I7abcdcc2d7d967179c47081a6db2b417164891f3
TreeHugger Robot [Thu, 24 Aug 2017 01:39:10 +0000 (01:39 +0000)]
Merge "Fix issue with race when updating/using layout algorithm." into oc-mr1-dev
Beverly Tai [Thu, 24 Aug 2017 01:34:25 +0000 (01:34 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
am:
a2dbf80a13
Change-Id: I7b9bdcbf16e6b91d87e9c86609d9e1d7d174db44
Erik Kline [Thu, 24 Aug 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev
am:
568cd41216
Change-Id: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Beverly Tai [Thu, 24 Aug 2017 01:23:33 +0000 (01:23 +0000)]
Merge "DND footer doesn't stutter when exiting DND mode." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 01:14:59 +0000 (01:14 +0000)]
Merge "Make Typeface.create thread safe."
TreeHugger Robot [Thu, 24 Aug 2017 01:09:57 +0000 (01:09 +0000)]
Merge "Send add/removeDownstream info to offload HAL" into oc-mr1-dev
Sundeep Ghuman [Thu, 24 Aug 2017 01:01:02 +0000 (01:01 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev am:
53414a98c2
am:
64cabefed0 -s ours
Change-Id: I87a939b11398381ed4477d93a0099ac8f4ca4328
Nate Fischer [Thu, 24 Aug 2017 00:54:10 +0000 (00:54 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev am:
bc99692f02
am:
da6710a9fe
Change-Id: Ide4ccd8bd1577a97829695e93f77e251cef52127
Felipe Leme [Thu, 24 Aug 2017 00:11:54 +0000 (00:11 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev am:
102e6631cf
am:
12b91559ce
Change-Id: Ieaeb8ae7cb765f493492d267e9f73bbe3b7d3b57
Matthew Ng [Thu, 24 Aug 2017 00:05:40 +0000 (00:05 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev am:
4ce4d954e3
am:
3a41d243f1
Change-Id: I639e13a250f34f3d1603bf95fc146634c82aa7f9
Sundeep Ghuman [Thu, 24 Aug 2017 00:05:26 +0000 (00:05 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
am:
53414a98c2
Change-Id: Ifc2540c0d8d4e1fdebdfe5127d36f45b68795ef3
Nate Fischer [Wed, 23 Aug 2017 23:56:56 +0000 (23:56 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
am:
bc99692f02
Change-Id: I515ab33e8a306c4f8c0cd64d0bc3d8269d0c1904
Sundeep Ghuman [Tue, 15 Aug 2017 22:47:18 +0000 (15:47 -0700)]
Implement score cache eviction in AccessPoint.
This prevents cached scores from being held indefinitely and used for
SSID fallback logic in WifiTracker (Picker).
Bug:
63073866
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: Ib351d20db30dfd18b69bb1f8e4d4f26fc6b74ef0
TreeHugger Robot [Wed, 23 Aug 2017 23:43:16 +0000 (23:43 +0000)]
Merge "Generate fallback speed label in AccessPoint.java" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:41:56 +0000 (23:41 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface" into oc-mr1-dev
Felipe Leme [Wed, 23 Aug 2017 23:40:30 +0000 (23:40 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
am:
102e6631cf
Change-Id: I8ed730d3634ae90559d0b5ca9de49834031af19d
Svetoslav Ganov [Wed, 23 Aug 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev am:
ee580764ad
am:
58d7ef66c5
Change-Id: If59ded7ac42c8277d12b8f65865806e8ffb9f036
Matthew Ng [Wed, 23 Aug 2017 23:34:03 +0000 (23:34 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev
am:
4ce4d954e3
Change-Id: Id3afb3782703221d6f97c290dd9259ecbc91293b
Svetoslav Ganov [Wed, 23 Aug 2017 23:21:18 +0000 (23:21 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
am:
ee580764ad
Change-Id: Ie766ecd41d2ac07dd3608fa4ed69edc3c575058f
TreeHugger Robot [Wed, 23 Aug 2017 23:15:59 +0000 (23:15 +0000)]
Merge "Fixed synchronization when calling cancellation signal." into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 23:01:53 +0000 (23:01 +0000)]
Merge "Always use low-res tasksnapshots for low ram devices" into oc-mr1-dev
Sudheer Shanka [Wed, 23 Aug 2017 23:01:49 +0000 (23:01 +0000)]
Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am:
29091ec55f" into oc-mr1-dev-plus-aosp
am:
383551da86
Change-Id: I9303dbda0f4d82c161d8cddacc8d3a56ebe1d52c
Hall Liu [Wed, 23 Aug 2017 22:52:08 +0000 (22:52 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0 am:
aeb64f7f98 am:
070508ea7a
am:
e599803180
Change-Id: I88446f4080582fcfea1428c57166c1d8c9f822cd
TreeHugger Robot [Wed, 23 Aug 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Use all certs for computing package signing sha256" into oc-mr1-dev
Android Build Merger (Role) [Wed, 23 Aug 2017 22:45:42 +0000 (22:45 +0000)]
Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am:
29091ec55f" into oc-mr1-dev-plus-aosp
OSDN Git Service
