Eric Sandness
b2fed746d3
Merge "Permission Check For DPM Get IME API" into pi-dev
...
am: 78931a0f95
Change-Id: If81408f57757f1649b3355cc158a2539b33f646f
2018-03-29 08:38:29 +00:00
Eric Sandness
78931a0f95
Merge "Permission Check For DPM Get IME API" into pi-dev
2018-03-29 08:25:09 +00:00
Remi NGUYEN VAN
62df0a68e0
Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
...
am: aa20932ff1
Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
2018-03-29 07:46:34 +00:00
Remi NGUYEN VAN
aa20932ff1
Merge "Fix network usage stats on 464xlat tethered."
...
am: 83088dcd8e
Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
2018-03-29 07:36:21 +00:00
Mathew Inwood
fe930f2023
Merge "Configurable hidden API exemptions." into pi-dev
2018-03-29 06:49:27 +00:00
Amith Yamasani
7bdf3c6155
Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev
...
am: 50c069e489
Change-Id: Idd2b0abba22ec10e263fe3ab49ecc7346b9bc941
2018-03-29 06:18:19 +00:00
Amith Yamasani
93c6045a04
Merge "Add slice pinning to list of reasons for usage" into pi-dev
...
am: 37594c892d
Change-Id: I90264decb0d458dc084e3c484a6716058ca58a63
2018-03-29 06:04:08 +00:00
Remi NGUYEN VAN
83088dcd8e
Merge "Fix network usage stats on 464xlat tethered."
2018-03-29 06:04:02 +00:00
TreeHugger Robot
50c069e489
Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev
2018-03-29 06:03:17 +00:00
TreeHugger Robot
37594c892d
Merge "Add slice pinning to list of reasons for usage" into pi-dev
2018-03-29 05:51:24 +00:00
TreeHugger Robot
4f52f3fd52
Merge "Bluetooth HIDD: Remove unplug()" into pi-dev
2018-03-29 04:23:46 +00:00
Julia Reynolds
2bc9e4fdf3
Merge "Properly filter alert window notifications" into pi-dev
...
am: cfa0f19fa1
Change-Id: I2eda66d48b148156f8e6b2dc0a29bd1256ffbc16
2018-03-29 04:03:50 +00:00
TreeHugger Robot
cfa0f19fa1
Merge "Properly filter alert window notifications" into pi-dev
2018-03-29 03:50:31 +00:00
Hansong Zhang
923f5cf935
Merge "Bluetooth HIDD: Remove unplug()" am: 18aa649b8f
...
am: d8ae68626f
Change-Id: Iacdbc31172e87621127d66e8214307a14ab76499
2018-03-29 01:43:24 +00:00
Hansong Zhang
d8ae68626f
Merge "Bluetooth HIDD: Remove unplug()"
...
am: 18aa649b8f
Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
2018-03-29 01:28:41 +00:00
Ricky Wai
e11325abb3
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
...
am: b0558905c5
Change-Id: Ie8b2062a62c2d64b7b67646236ec048cb9afcf6d
2018-03-29 01:04:38 +00:00
Mady Mellor
e9761dcc70
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
...
am: 822dfea6ca
Change-Id: I3e366649169e6f7fa12f6ae31e7b0d72048b138d
2018-03-29 00:59:04 +00:00
Michael Wachenschwanz
b98ecddeba
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
...
am: 631f55ba54
Change-Id: Icf55fa2d58a0d36c21e331f1756e3f05b3cc61f0
2018-03-29 00:11:25 +00:00
Ricky Wai
b0558905c5
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
2018-03-29 00:04:26 +00:00
TreeHugger Robot
822dfea6ca
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
2018-03-28 23:59:37 +00:00
Hansong Zhang
4b410fa9f9
Bluetooth HIDD: Remove unplug()
...
Remove the hidden unplug() API because it is not used and it can cause
the remote device to be unpaired. System apps should use unbond() and
user apps should not use reflection to invoke it.
Bug: 67866553
Test: SL4A
Change-Id: I1bdc06dbb5460c9fd52230b78cbf9434a4349d24
(cherry picked from commit dbc6d14f6e )
2018-03-28 23:18:54 +00:00
TreeHugger Robot
631f55ba54
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
2018-03-28 23:18:01 +00:00
Joshua Baxter
affc3087f5
Merge "docs: fixed a couple of typos" into oc-mr1-dev am: 651ffd426c
...
am: 9a2d959eff
Change-Id: I02788adeb444186d8d9e0471fe326d090d9199d7
2018-03-28 23:08:09 +00:00
Chris Wren
315c41b60c
Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev
...
am: 362b3522d1
Change-Id: Id01778f18acba57ad19353e814fd0f8f278c3bc2
2018-03-28 22:14:20 +00:00
Robert Berry
725f2dfe36
Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev
...
am: 88f8de612d
Change-Id: I38aa9b19b3ed22376824dda753b0c30ef2df458e
2018-03-28 22:09:02 +00:00
Joshua Baxter
9a2d959eff
Merge "docs: fixed a couple of typos" into oc-mr1-dev
...
am: 651ffd426c
Change-Id: Ie6fb97aae76637023657d751f6ad0ebbc74ff284
2018-03-28 22:06:24 +00:00
Joshua Baxter
651ffd426c
Merge "docs: fixed a couple of typos" into oc-mr1-dev
2018-03-28 21:54:29 +00:00
Shuzhen Wang
aa306f2788
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
...
am: 889b21d181
Change-Id: Ie84c255622923029ba546683274c76c7d3aa7ec6
2018-03-28 21:53:26 +00:00
Abodunrinwa Toki
12dea84530
Merge "Implement Stateful TextClassifier APIs." into pi-dev
...
am: 119d10deb9
Change-Id: Ia627d4c265a585b14beebd98a3f6fb20d5d36eca
2018-03-28 21:41:36 +00:00
Calin Juravle
3f49339787
Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
...
am: dedfd8fec7
Change-Id: Id147341527f602e2fa0d2a88f7e01281293d36a8
2018-03-28 21:32:39 +00:00
TreeHugger Robot
362b3522d1
Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev
2018-03-28 21:18:33 +00:00
TreeHugger Robot
88f8de612d
Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev
2018-03-28 21:10:54 +00:00
TreeHugger Robot
889b21d181
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
2018-03-28 21:01:31 +00:00
David Pursell
bea874b7fa
Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f7b
...
am: 040587641b
Change-Id: Ia4537ab0db75eabe8b3bf3fc07585a36769727f8
2018-03-28 20:59:26 +00:00
Abodunrinwa Toki
119d10deb9
Merge "Implement Stateful TextClassifier APIs." into pi-dev
2018-03-28 20:58:47 +00:00
Amith Yamasani
3154dcf94a
Fallback to ML prediction after short ACTIVE states
...
When an app is temporarily elevated to ACTIVE state for some
reason, keep track of the last predicted bucket and drop back
to that if the ACTIVE state ends.
Also keep track of prediction during a forced ACTIVE state, even
if it's not applied right away.
Bug: 77158823
Test: atest AppStandbyControllerTests
Change-Id: Ic6de6c24bb25c5392ac5b41a2c05889d94f23436
2018-03-28 13:49:21 -07:00
David Pursell
040587641b
Merge "MessageQueue: explicitly remove FD event listeners."
...
am: b43daf5f7b
Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7
2018-03-28 20:43:07 +00:00
Julia Reynolds
3c7de110cc
Properly filter alert window notifications
...
Test: atest SystemUITests
Change-Id: Ie07ffeb7a96469d985261c9a1edb1d7ce82af5c5
Fixes: 77162311
2018-03-28 16:41:01 -04:00
TreeHugger Robot
dedfd8fec7
Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
2018-03-28 20:35:37 +00:00
Hansong Zhang
dbc6d14f6e
Bluetooth HIDD: Remove unplug()
...
Remove the hidden unplug() API because it is not used and it can cause
the remote device to be unpaired. System apps should use unbond() and
user apps should not use reflection to invoke it.
Bug: 67866553
Test: SL4A
Change-Id: I1bdc06dbb5460c9fd52230b78cbf9434a4349d24
2018-03-28 20:11:18 +00:00
Jorim Jaggi
162b5e89ec
Merge "Add different animation for transitions with translucent apps" into pi-dev
...
am: 13c4b14e92
Change-Id: Ice110754fd73cfc576c89bec346792cdcdd9802b
2018-03-28 19:39:34 +00:00
Jorim Jaggi
13c4b14e92
Merge "Add different animation for transitions with translucent apps" into pi-dev
2018-03-28 19:09:08 +00:00
Vishwath Mohan
77b5ccb59b
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
...
am: 86ed912f5a
Change-Id: I2582d4770900460a8d37c9d832e9a20583f9adf9
2018-03-28 19:01:11 +00:00
Vishwath Mohan
86ed912f5a
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
2018-03-28 18:46:34 +00:00
Jiuyu Sun
64034c6edd
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
...
am: b1adae546c
Change-Id: Ic58c98fac6a1b792ca9525653b3e07e5839741f4
2018-03-28 18:08:43 +00:00
Treehugger Robot
b43daf5f7b
Merge "MessageQueue: explicitly remove FD event listeners."
2018-03-28 18:06:31 +00:00
Jiuyu Sun
b1adae546c
Merge "Add grant and revoke default permissions to active LUI app." into pi-dev
2018-03-28 17:44:35 +00:00
Robert Berry
39cf42c927
Add autobackup XML support for test BackupTransport flag
...
We need this to be able to write a CTS test.
Bug: 73710054
Test: runtest frameworks-core -p android.app.backup
Change-Id: I37d4b64d40426c5de47308394e21baebd542ad52
2018-03-28 17:31:45 +00:00
Jan Althaus
39441a9d85
Merge "Change TextClassification to use RemoteActions" into pi-dev
...
am: 08a75e0ee7
Change-Id: I411c8b207e24c6a4e9ca8660619fae1e0a3a8ef7
2018-03-28 17:23:56 +00:00
Jan Althaus
08a75e0ee7
Merge "Change TextClassification to use RemoteActions" into pi-dev
2018-03-28 17:04:58 +00:00