OSDN Git Service
Remi NGUYEN VAN [Thu, 29 Mar 2018 07:46:34 +0000 (07:46 +0000)]
Merge "Fix network usage stats on 464xlat tethered." am:
83088dcd8e
am:
aa20932ff1
Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
Remi NGUYEN VAN [Thu, 29 Mar 2018 07:36:21 +0000 (07:36 +0000)]
Merge "Fix network usage stats on 464xlat tethered."
am:
83088dcd8e
Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
Mathew Inwood [Thu, 29 Mar 2018 07:14:20 +0000 (07:14 +0000)]
[automerger skipped] Merge "Use commas to separate API exemptions list, not colon." into pi-dev
am:
d598caacfc -s ours
Change-Id: I4a79f5554df80d75c00f66c86d6655d34d4b961d
Mathew Inwood [Thu, 29 Mar 2018 07:08:24 +0000 (07:08 +0000)]
[automerger skipped] Merge "Configurable hidden API exemptions." into pi-dev
am:
fe930f2023 -s ours
Change-Id: Ib56faa6cc756d87b8c8654dbf0b1655d310e6d38
Mathew Inwood [Thu, 29 Mar 2018 07:03:22 +0000 (07:03 +0000)]
[automerger skipped] Configurable hidden API exemptions.
am:
8faeab8735 -s ours
Change-Id: I3ed771b430de60588bc793c215c7e6fe9a1cabc9
Mathew Inwood [Thu, 29 Mar 2018 06:50:23 +0000 (06:50 +0000)]
Merge "Use commas to separate API exemptions list, not colon." into pi-dev
Mathew Inwood [Thu, 29 Mar 2018 06:49:27 +0000 (06:49 +0000)]
Merge "Configurable hidden API exemptions." into pi-dev
Amith Yamasani [Thu, 29 Mar 2018 06:18:19 +0000 (06:18 +0000)]
Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev
am:
50c069e489
Change-Id: Idd2b0abba22ec10e263fe3ab49ecc7346b9bc941
Amith Yamasani [Thu, 29 Mar 2018 06:04:08 +0000 (06:04 +0000)]
Merge "Add slice pinning to list of reasons for usage" into pi-dev
am:
37594c892d
Change-Id: I90264decb0d458dc084e3c484a6716058ca58a63
Remi NGUYEN VAN [Thu, 29 Mar 2018 06:04:02 +0000 (06:04 +0000)]
Merge "Fix network usage stats on 464xlat tethered."
TreeHugger Robot [Thu, 29 Mar 2018 06:03:17 +0000 (06:03 +0000)]
Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 05:51:24 +0000 (05:51 +0000)]
Merge "Add slice pinning to list of reasons for usage" into pi-dev
Tracy Zhou [Thu, 29 Mar 2018 05:43:39 +0000 (05:43 +0000)]
Merge "Refactor how we calculate offset for PIP animation" into pi-dev
am:
e33543ff69
Change-Id: Ib1035269941c14700244c3245526b3648d429cdb
Jeff Tinker [Thu, 29 Mar 2018 05:27:49 +0000 (05:27 +0000)]
Merge "Rename MediaDrm security levels" into pi-dev
am:
5fa492f9b6
Change-Id: I206024eb41cdc9e9babc5c0e14c612572146a59d
Tracy Zhou [Thu, 29 Mar 2018 05:24:42 +0000 (05:24 +0000)]
Merge "Refactor how we calculate offset for PIP animation" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 05:18:32 +0000 (05:18 +0000)]
Merge "Rename MediaDrm security levels" into pi-dev
Hyundo Moon [Thu, 29 Mar 2018 05:02:51 +0000 (05:02 +0000)]
Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev
am:
7a3593d0b6
Change-Id: Ibed8ed024743a05584d1a07e0fd4554f42833606
TreeHugger Robot [Thu, 29 Mar 2018 04:50:59 +0000 (04:50 +0000)]
Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev
* changes:
MediaBrowserService: Create getCurrentBrowserInfo()
MediaSession: Create getCurentControllerInfo()
MediaSessionManager: Add isTrustedForMediaControl()
Hansong Zhang [Thu, 29 Mar 2018 04:42:52 +0000 (04:42 +0000)]
Merge "Bluetooth HIDD: Remove unplug()" into pi-dev
am:
4f52f3fd52
Change-Id: I9b3484e79a8817a5c119c87392c8a0297d8081ef
Jaekyun Seok [Thu, 29 Mar 2018 04:30:12 +0000 (04:30 +0000)]
Merge "Fix deadlock when ParallelPackageParserCallback is used" into pi-dev
am:
4170ab233d
Change-Id: I6e460544a030e58e3a92fe724f0be700c6ce519c
TreeHugger Robot [Thu, 29 Mar 2018 04:23:46 +0000 (04:23 +0000)]
Merge "Bluetooth HIDD: Remove unplug()" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 04:18:51 +0000 (04:18 +0000)]
Merge "Fix deadlock when ParallelPackageParserCallback is used" into pi-dev
Julia Reynolds [Thu, 29 Mar 2018 04:03:50 +0000 (04:03 +0000)]
Merge "Properly filter alert window notifications" into pi-dev
am:
cfa0f19fa1
Change-Id: I2eda66d48b148156f8e6b2dc0a29bd1256ffbc16
TreeHugger Robot [Thu, 29 Mar 2018 03:50:31 +0000 (03:50 +0000)]
Merge "Properly filter alert window notifications" into pi-dev
Hall Liu [Thu, 29 Mar 2018 03:17:53 +0000 (03:17 +0000)]
Merge "Add additional logging for EMBMS edge cases" into pi-dev
am:
d63c009d5f
Change-Id: I786f885684d3d40788bff9b1d312144a8a62e63d
TreeHugger Robot [Thu, 29 Mar 2018 03:01:34 +0000 (03:01 +0000)]
Merge "Add additional logging for EMBMS edge cases" into pi-dev
Rohan Shah [Thu, 29 Mar 2018 02:58:49 +0000 (02:58 +0000)]
Merge "[Notif] Write AppUid earlier in NotificationInfo" into pi-dev
am:
f07d10e36b
Change-Id: I06db3710595420f259d8b37c48e2ed31550361c9
TreeHugger Robot [Thu, 29 Mar 2018 02:43:23 +0000 (02:43 +0000)]
Merge "[Notif] Write AppUid earlier in NotificationInfo" into pi-dev
Hyundo Moon [Mon, 26 Mar 2018 08:12:21 +0000 (17:12 +0900)]
MediaBrowserService: Create getCurrentBrowserInfo()
Bug:
65739365
Test: Ran MediaBrowserServiceTest
Change-Id: I629d74bcf9a08a2271463fecbacc2d998dce4387
Hyundo Moon [Thu, 22 Mar 2018 08:22:14 +0000 (17:22 +0900)]
MediaSession: Create getCurentControllerInfo()
Bug:
65739365
Test: Ran MediaControllerTest
Change-Id: I05c9179546d826e8fabb4fd4e4e03837dd4685ff
Jaewan Kim [Thu, 22 Mar 2018 15:13:51 +0000 (00:13 +0900)]
MediaSessionManager: Add isTrustedForMediaControl()
The API checks whether an app is granted MEDIA_CONTENT_CONTROL
permisison or has enabled notification listener. Such apps can be
considered as the system component (e.g. Bluetooth) or equivalent (e.g.
Auto/Wearable companion app), so sessions shouldn't refuse connection
request from it.
It needs to be public because API for checking whether an app has an
enabled notification listener can only be called by the system service.
(see: NotificationManager.getEnabledNotificationListeners(int))
With the MediaSessionManager#isTrustedForMediaControl(),
MediaSessionService will query the information indirectly for a session
to tell an app is trusted.
Note that this isn't workaround for bypassing permission check of
NotificationManager API calls. It's indirectly available through
the android.provider.Settings.Secure with the *deprecated* key
ENABLD_NOTIFICATION_LISTENERS and it doesn't need any permission.
MediaSessionManager#isTrustedForMediaControl() is needed to avoid using
deprecated key for querying notification listeners.
Bug:
75500592
Test: Build
Change-Id: I8d1183aa946aa0d2ec35dbd7f31933d1c2717f99
Siddharth Ray [Thu, 29 Mar 2018 02:19:12 +0000 (02:19 +0000)]
Merge "Add Battery time to location dumpsys" into pi-dev
am:
b1d14ec3e1
Change-Id: Ib5bd4eb953888da96be7dbee8ebaacb86e2e0a6c
Jaekyun Seok [Thu, 29 Mar 2018 02:02:10 +0000 (11:02 +0900)]
Fix deadlock when ParallelPackageParserCallback is used
Bug:
77232370
Test: succeeded building and tested with taimen
Change-Id: I425686c65a3cee88c10fceb7b5d0b5d89e49fc70
Vishwath Mohan [Thu, 29 Mar 2018 02:13:10 +0000 (02:13 +0000)]
Merge "Clear pattern on completion (if fade is enabled)." into pi-dev
am:
9cfdcfaf92
Change-Id: I813f75dd452e1401bbaf89e18f05ae7204aaff46
TreeHugger Robot [Thu, 29 Mar 2018 02:08:04 +0000 (02:08 +0000)]
Merge "Add Battery time to location dumpsys" into pi-dev
Rohan Shah [Thu, 29 Mar 2018 02:03:54 +0000 (02:03 +0000)]
Merge "[Notif] Remove old blocking helper button" into pi-dev
am:
a0a7a86acf
Change-Id: Ib66a74a513b0bdc5057a402cbf935ddd2b6a3cb2
Brad Stenning [Thu, 29 Mar 2018 01:47:59 +0000 (01:47 +0000)]
Merge "Add an option to display HVAC temp values in sysui" into pi-dev
am:
4f4baf1e0e
Change-Id: I3592761fcf40ee6cd38de956d8712da2f50ef177
Hansong Zhang [Thu, 29 Mar 2018 01:43:24 +0000 (01:43 +0000)]
Merge "Bluetooth HIDD: Remove unplug()" am:
18aa649b8f
am:
d8ae68626f
Change-Id: Iacdbc31172e87621127d66e8214307a14ab76499
Android Build Merger (Role) [Thu, 29 Mar 2018 01:38:48 +0000 (01:38 +0000)]
Merge "Merge "Add additional logging for EMBMS edge cases" am:
de57d0d024 am:
8b8591ce46" into pi-dev-plus-aosp
Hall Liu [Thu, 29 Mar 2018 01:38:25 +0000 (01:38 +0000)]
Merge "Add additional logging for EMBMS edge cases" am:
de57d0d024
am:
8b8591ce46
Change-Id: I0970e3a9eb83cd11c6bcbd014f6365e6c7884876
Android Build Merger (Role) [Thu, 29 Mar 2018 01:37:08 +0000 (01:37 +0000)]
Merge "Merge "Add constants for reporting criteria" into pi-dev am:
a210ef2687" into pi-dev-plus-aosp
Eric Schwarzenbach [Thu, 29 Mar 2018 01:35:40 +0000 (01:35 +0000)]
Merge "Add constants for reporting criteria" into pi-dev
am:
a210ef2687
Change-Id: I531288032cdcd6693bc66706bb09c8ab3aa17989
Holly Jiuyu Sun [Thu, 29 Mar 2018 01:32:20 +0000 (01:32 +0000)]
[automerger skipped] Merge "Address comments from API Review." am:
18e47b6108
am:
bdd350c036 -s ours
Change-Id: Icd78c8087d4056fa59f43e41b45b7fd97757a978
Hansong Zhang [Thu, 29 Mar 2018 01:28:41 +0000 (01:28 +0000)]
Merge "Bluetooth HIDD: Remove unplug()"
am:
18aa649b8f
Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
Hall Liu [Thu, 29 Mar 2018 01:25:09 +0000 (01:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
am:
de57d0d024
Change-Id: If9af4947275e18154c93d9d8f6756cac16317768
Holly Jiuyu Sun [Thu, 29 Mar 2018 01:22:38 +0000 (01:22 +0000)]
Merge "Address comments from API Review."
am:
18e47b6108
Change-Id: I3a4c1a0592df3b3c4f7625553bc9b92296da5c73
TreeHugger Robot [Thu, 29 Mar 2018 01:06:06 +0000 (01:06 +0000)]
Merge "Clear pattern on completion (if fade is enabled)." into pi-dev
Ricky Wai [Thu, 29 Mar 2018 01:04:38 +0000 (01:04 +0000)]
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
am:
b0558905c5
Change-Id: Ie8b2062a62c2d64b7b67646236ec048cb9afcf6d
Mady Mellor [Thu, 29 Mar 2018 00:59:04 +0000 (00:59 +0000)]
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
am:
822dfea6ca
Change-Id: I3e366649169e6f7fa12f6ae31e7b0d72048b138d
TreeHugger Robot [Thu, 29 Mar 2018 00:57:22 +0000 (00:57 +0000)]
Merge "[Notif] Remove old blocking helper button" into pi-dev
Matthew Ng [Thu, 29 Mar 2018 00:55:05 +0000 (00:55 +0000)]
Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev
am:
9822fffc7e
Change-Id: I1d3fefa6d6b81a5da6e1a9a4c75ad3036e609e3c
Lucas Dupin [Thu, 29 Mar 2018 00:51:29 +0000 (00:51 +0000)]
Merge "Use sentence case on "clear all" button" into pi-dev
am:
36a7eece58
Change-Id: I4f351534f902da625825b105a12277cedcbd47ae
Rohan Shah [Wed, 28 Mar 2018 21:46:50 +0000 (14:46 -0700)]
[Notif] Write AppUid earlier in NotificationInfo
Noticed that appuid was being used but it wasn't set until later in the
lifecycle of the notificationinfo (rendering the channel logic moot).
If the notif is now posting notificiations to the default channel while
having multiple channels, it'll now show "Uncategorized" in the blocking
helper/notification info screens.
Fixes:
77240828
Test: Ran NotifInfoTest (added one new test case)
Test: Visually, artificially sent default ch notif with app having 9 ch
Change-Id: I45f2c35fb6dae610e511b2d316b3c184b84f2d09
TreeHugger Robot [Thu, 29 Mar 2018 00:46:29 +0000 (00:46 +0000)]
Merge "Add an option to display HVAC temp values in sysui" into pi-dev
Matthew Ng [Thu, 29 Mar 2018 00:38:56 +0000 (00:38 +0000)]
Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev
am:
6ef6c1603b
Change-Id: I64ce2301b7c9e38263d64b10a479698bfb4e68c4
TreeHugger Robot [Thu, 29 Mar 2018 00:23:37 +0000 (00:23 +0000)]
Merge "Add constants for reporting criteria" into pi-dev
Jeff Tinker [Thu, 29 Mar 2018 00:16:50 +0000 (17:16 -0700)]
Rename MediaDrm security levels
API review requested that MediaDrm security
levels be prefixed with a common string.
bug:
76449152
bug:
74831432
Change-Id: I2b4d5ed2c881f736659f29aa76c556a79d1335f4
Michael Wachenschwanz [Thu, 29 Mar 2018 00:11:25 +0000 (00:11 +0000)]
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
am:
631f55ba54
Change-Id: Icf55fa2d58a0d36c21e331f1756e3f05b3cc61f0
Ricky Wai [Thu, 29 Mar 2018 00:04:26 +0000 (00:04 +0000)]
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
Amin Shaikh [Thu, 29 Mar 2018 00:03:47 +0000 (00:03 +0000)]
Merge "Add vibrate/mute details to QS header." into pi-dev
am:
0a27c8d329
Change-Id: Ie6217a78cfc509af512205ed7a0205ca392d5642
TreeHugger Robot [Wed, 28 Mar 2018 23:59:37 +0000 (23:59 +0000)]
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
Philip P. Moltmann [Wed, 28 Mar 2018 23:58:59 +0000 (23:58 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
am:
a49954d3ab
Change-Id: Iae9b97679f75b37c3fa063af708ab7775c00b1b6
TreeHugger Robot [Wed, 28 Mar 2018 23:55:22 +0000 (23:55 +0000)]
Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev
Andreas Huber [Wed, 28 Mar 2018 23:48:55 +0000 (23:48 +0000)]
Merge "Remove no longer needed workaround for new devices that previously" into pi-dev
am:
904c438135
Change-Id: I482d174ef346b44f91038bf8a65caa3ddac9d1a6
TreeHugger Robot [Wed, 28 Mar 2018 23:43:39 +0000 (23:43 +0000)]
Merge "Use sentence case on "clear all" button" into pi-dev
Sudheer Shanka [Wed, 28 Mar 2018 23:43:39 +0000 (23:43 +0000)]
Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev
am:
0302f56c8f
Change-Id: Ic1f27e5a4084964b61e07774af8b95bb36893079
TreeHugger Robot [Wed, 28 Mar 2018 23:39:47 +0000 (23:39 +0000)]
Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev
Felipe Leme [Wed, 28 Mar 2018 23:32:47 +0000 (23:32 +0000)]
Merge "Created framework resource for autofill_max_visible_datasets." into pi-dev
am:
e845d664d1
Change-Id: Ib0892ee7d8bc88325f0403e2809f4c25e818e367
Hansong Zhang [Wed, 28 Mar 2018 19:56:05 +0000 (12:56 -0700)]
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
dbc6d14f6ec399e63cee29adbe01fffcb166500f)
TreeHugger Robot [Wed, 28 Mar 2018 23:18:01 +0000 (23:18 +0000)]
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
Android Build Merger (Role) [Wed, 28 Mar 2018 23:17:07 +0000 (23:17 +0000)]
Merge "[automerger skipped] Merge "Remove non-tombstoned ANR path." am:
ff95c80198 am:
750409de36 -s ours" into pi-dev-plus-aosp
Elliott Hughes [Wed, 28 Mar 2018 23:16:43 +0000 (23:16 +0000)]
[automerger skipped] Merge "Remove non-tombstoned ANR path." am:
ff95c80198
am:
750409de36 -s ours
Change-Id: I8889ec4d76eaec5bccd8c375ced94fa662fabc4a
yuemingw [Wed, 28 Mar 2018 23:15:07 +0000 (23:15 +0000)]
Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev
am:
e9b491bd37
Change-Id: I2fcc2320165fc4ffa8b44f4f891b85c43284e424
Joshua Baxter [Wed, 28 Mar 2018 23:08:09 +0000 (23:08 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev am:
651ffd426c
am:
9a2d959eff
Change-Id: I02788adeb444186d8d9e0471fe326d090d9199d7
Elliott Hughes [Wed, 28 Mar 2018 23:03:55 +0000 (23:03 +0000)]
Merge "Remove non-tombstoned ANR path."
am:
ff95c80198
Change-Id: Ifdf565635e1707822794d88db7117ca5ac986d1d
Treehugger Robot [Wed, 28 Mar 2018 23:02:57 +0000 (23:02 +0000)]
Merge "Bluetooth HIDD: Remove unplug()"
TreeHugger Robot [Wed, 28 Mar 2018 23:02:26 +0000 (23:02 +0000)]
Merge "Add vibrate/mute details to QS header." into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 23:02:04 +0000 (23:02 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 23:00:35 +0000 (23:00 +0000)]
Merge "Remove no longer needed workaround for new devices that previously" into pi-dev
Sudheer Shanka [Wed, 28 Mar 2018 22:56:13 +0000 (22:56 +0000)]
Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev
Matthew Ng [Wed, 28 Mar 2018 21:02:00 +0000 (14:02 -0700)]
Opalayout can check quickstep icons without needing navbarview (1/2)
Opalayout should not need NavigationBarView to determine if the icon
should be for quickstep icons. It does not need to know if recents is
disabled because of lock tasks and so the check is now in
OverviewProxyService. Then when Opalayout needs to layout the home
button it should be able to get the information regardless if
NavigationBarView is available or not.
Bug:
76210393
Fixes:
76434966
Fixes:
74071465
Test: change language in settings
Change-Id: I246175c3e2d5c990da6823df4108d48522b258bd
Adam Bookatz [Wed, 28 Mar 2018 22:51:50 +0000 (22:51 +0000)]
Merge "Fix statsd ble scan logging" into pi-dev
am:
f50e78d8f7
Change-Id: I5e3ab9952a44d51479389360fbed9dcfb548a8e2
Brad Stenning [Tue, 27 Mar 2018 20:57:29 +0000 (13:57 -0700)]
Add an option to display HVAC temp values in sysui
Bug:
77148007
Test: on device that has a real HVAC unit
Change-Id: I97b303dd947858157ede72c5d537ae6a1e40cc67
Etan Cohen [Wed, 28 Mar 2018 22:41:25 +0000 (22:41 +0000)]
Merge "[RTT] Expose new public API for number of measurements" into pi-dev
am:
8d2404d1cd
Change-Id: I3418b5cae24457dd77b8573926b264c8e209c161
TreeHugger Robot [Wed, 28 Mar 2018 22:39:29 +0000 (22:39 +0000)]
Merge "Created framework resource for autofill_max_visible_datasets." into pi-dev
Hall Liu [Fri, 9 Mar 2018 01:45:12 +0000 (17:45 -0800)]
Add additional logging for EMBMS edge cases
Add logging when failing to delete temp files or write download
tokens.
Test: logging only
Bug:
77237200
Change-Id: Id7836f3660d37d8cd94580d221c95b2c15c2cb68
TreeHugger Robot [Wed, 28 Mar 2018 22:31:46 +0000 (22:31 +0000)]
Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev
Hall Liu [Wed, 28 Mar 2018 22:25:44 +0000 (22:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
Chris Wren [Wed, 28 Mar 2018 22:14:20 +0000 (22:14 +0000)]
Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev
am:
362b3522d1
Change-Id: Id01778f18acba57ad19353e814fd0f8f278c3bc2
Robert Berry [Wed, 28 Mar 2018 22:09:02 +0000 (22:09 +0000)]
Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev
am:
88f8de612d
Change-Id: I38aa9b19b3ed22376824dda753b0c30ef2df458e
Joshua Baxter [Wed, 28 Mar 2018 22:06:24 +0000 (22:06 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev
am:
651ffd426c
Change-Id: Ie6fb97aae76637023657d751f6ad0ebbc74ff284
Holly Jiuyu Sun [Wed, 28 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Address comments from API Review."
Joshua Baxter [Wed, 28 Mar 2018 21:54:29 +0000 (21:54 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev
Shuzhen Wang [Wed, 28 Mar 2018 21:53:26 +0000 (21:53 +0000)]
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
am:
889b21d181
Change-Id: Ie84c255622923029ba546683274c76c7d3aa7ec6
Adam Bookatz [Wed, 28 Mar 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Fix statsd ble scan logging" into pi-dev
Abodunrinwa Toki [Wed, 28 Mar 2018 21:41:36 +0000 (21:41 +0000)]
Merge "Implement Stateful TextClassifier APIs." into pi-dev
am:
119d10deb9
Change-Id: Ia627d4c265a585b14beebd98a3f6fb20d5d36eca
Etan Cohen [Wed, 28 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge "[RTT] Expose new public API for number of measurements" into pi-dev
Mike Digman [Wed, 28 Mar 2018 21:36:13 +0000 (21:36 +0000)]
Merge "Make volume dialog only fade in/out in landscape" into pi-dev
am:
07150c5d75
Change-Id: Ic1db2e8a60fffd3d2265ceae14ae3775fe89f33c
Calin Juravle [Wed, 28 Mar 2018 21:32:39 +0000 (21:32 +0000)]
Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
am:
dedfd8fec7
Change-Id: Id147341527f602e2fa0d2a88f7e01281293d36a8
Julia Reynolds [Wed, 28 Mar 2018 21:25:15 +0000 (21:25 +0000)]
Merge "Fix capitalization" into pi-dev
am:
ee7b704c9c
Change-Id: I98aec0ddbd83d78bf7775077c013fe2d9b7956be