OSDN Git Service
Benjamin Franz [Thu, 29 Mar 2018 09:48:32 +0000 (09:48 +0000)]
Merge "Merge "Update to lock task features API" into pi-dev am:
3a5dabbb10" into pi-dev-plus-aosp
am:
4a93e2f209
Change-Id: I76e34c49b4e8376d6c742b65c05e7c5f71f6bd58
JC [Thu, 29 Mar 2018 09:32:26 +0000 (09:32 +0000)]
Merge "DCB whitelist short code for user association" am:
722282ec62 am:
b1e22988e6
am:
54ed6d39f0
Change-Id: I6dc0c695113d50cf776f17ed94ec7bc0a0cf19c4
Android Build Merger (Role) [Thu, 29 Mar 2018 09:20:03 +0000 (09:20 +0000)]
Merge "Merge "Update to lock task features API" into pi-dev am:
3a5dabbb10" into pi-dev-plus-aosp
Benjamin Franz [Thu, 29 Mar 2018 09:19:16 +0000 (09:19 +0000)]
Merge "Update to lock task features API" into pi-dev
am:
3a5dabbb10
Change-Id: Ie8a12a29bfca101d19d8ec104988633b7749bb5f
JC [Thu, 29 Mar 2018 09:18:21 +0000 (09:18 +0000)]
Merge "DCB whitelist short code for user association" am:
722282ec62
am:
b1e22988e6
Change-Id: I07592e3ffa7e56085d274436e2e28cba54ca05ac
JC [Thu, 29 Mar 2018 09:06:39 +0000 (09:06 +0000)]
Merge "DCB whitelist short code for user association"
am:
722282ec62
Change-Id: Id8c380c715a94336cd21af4b6a3e3ae9da11a1e1
Benjamin Franz [Thu, 29 Mar 2018 09:02:17 +0000 (09:02 +0000)]
Merge "Update to lock task features API" into pi-dev
Eric Sandness [Thu, 29 Mar 2018 08:52:16 +0000 (08:52 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev am:
78931a0f95
am:
b2fed746d3
Change-Id: Iedb0ecaff232204c0b75817d2f37a9247e33d6b2
Eric Sandness [Thu, 29 Mar 2018 08:38:29 +0000 (08:38 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev
am:
78931a0f95
Change-Id: If81408f57757f1649b3355cc158a2539b33f646f
Remi NGUYEN VAN [Thu, 29 Mar 2018 08:38:20 +0000 (08:38 +0000)]
Merge "Fix network usage stats on 464xlat tethered." am:
83088dcd8e am:
aa20932ff1
am:
62df0a68e0
Change-Id: Ieb25c41c651499fdd01225ae5ac21d95e3d823f5
Mathew Inwood [Thu, 29 Mar 2018 08:30:49 +0000 (08:30 +0000)]
[automerger skipped] Merge "Use commas to separate API exemptions list, not colon." into pi-dev am:
d598caacfc -s ours
am:
c89999a995 -s ours
Change-Id: I617ce2abe35276fe6d1f8e601284452f4affcdeb
Eric Sandness [Thu, 29 Mar 2018 08:25:09 +0000 (08:25 +0000)]
Merge "Permission Check For DPM Get IME API" into pi-dev
Mathew Inwood [Thu, 29 Mar 2018 08:24:52 +0000 (08:24 +0000)]
[automerger skipped] Merge "Configurable hidden API exemptions." into pi-dev am:
fe930f2023 -s ours
am:
67a07f6776 -s ours
Change-Id: If9d1a56c7cd2b6aa653de0146428c62753a5bdff
Mathew Inwood [Thu, 29 Mar 2018 08:04:20 +0000 (08:04 +0000)]
[automerger skipped] Configurable hidden API exemptions. am:
8faeab8735 -s ours
am:
4d22e5c690 -s ours
Change-Id: I7a2efc4804c008d2749ae00b282e035735c6a8af
Amith Yamasani [Thu, 29 Mar 2018 07:59:40 +0000 (07:59 +0000)]
Merge "Fallback to ML prediction after short ACTIVE states" into pi-dev am:
50c069e489
am:
7bdf3c6155
Change-Id: I1d82151ac1c8ba69ad2ea4f6fbced714fd49ac4a
Amith Yamasani [Thu, 29 Mar 2018 07:46:53 +0000 (07:46 +0000)]
Merge "Add slice pinning to list of reasons for usage" into pi-dev am:
37594c892d
am:
93c6045a04
Change-Id: Idf5f7909f36650b8fb1939ff8f2ae7873a83e497
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
Tracy Zhou [Thu, 29 Mar 2018 07:41:07 +0000 (07:41 +0000)]
Merge "Refactor how we calculate offset for PIP animation" into pi-dev am:
e33543ff69
am:
0a73c93b04
Change-Id: I29555e3702d8c3d83c0466d993e4f26eb31f23b1
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
Treehugger Robot [Thu, 29 Mar 2018 07:29:00 +0000 (07:29 +0000)]
Merge "DCB whitelist short code for user association"
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
Jeff Tinker [Thu, 29 Mar 2018 06:56:37 +0000 (06:56 +0000)]
Merge "Rename MediaDrm security levels" into pi-dev am:
5fa492f9b6
am:
46fd63a9ea
Change-Id: I7bb400b5eb5478f57427be99966299bd71131246
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
Hyundo Moon [Thu, 29 Mar 2018 06:48:52 +0000 (06:48 +0000)]
Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev am:
7a3593d0b6
am:
455dac3ab6
Change-Id: Id4c58987d0b75045d4ac2e9a46b3bd52f4ba3294
Hansong Zhang [Thu, 29 Mar 2018 06:43:28 +0000 (06:43 +0000)]
Merge "Bluetooth HIDD: Remove unplug()" into pi-dev am:
4f52f3fd52
am:
d82ddbde32
Change-Id: I301da2c079ca10e472b2dbd74a6d7779d87e6ed0
Jaekyun Seok [Thu, 29 Mar 2018 06:38:34 +0000 (06:38 +0000)]
Merge "Fix deadlock when ParallelPackageParserCallback is used" into pi-dev am:
4170ab233d
am:
70dad8edbe
Change-Id: I91a80a26cc32d958223bd9756eea907853771552
Julia Reynolds [Thu, 29 Mar 2018 06:33:52 +0000 (06:33 +0000)]
Merge "Properly filter alert window notifications" into pi-dev am:
cfa0f19fa1
am:
2bc9e4fdf3
Change-Id: Ia33b9dfe1399a7a787b6aa467edb9a7b74bde4be
Hall Liu [Thu, 29 Mar 2018 06:29:21 +0000 (06:29 +0000)]
Merge "Add additional logging for EMBMS edge cases" into pi-dev am:
d63c009d5f
am:
98e63d5654
Change-Id: Iafa0979877f5325013056d9785f24f0bb5e45b68
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
Rohan Shah [Thu, 29 Mar 2018 06:15:22 +0000 (06:15 +0000)]
Merge "[Notif] Write AppUid earlier in NotificationInfo" into pi-dev am:
f07d10e36b
am:
f5c5e73023
Change-Id: I7e02e0dbb02e787ea3e738521c7b2df46b806eb3
Siddharth Ray [Thu, 29 Mar 2018 06:09:27 +0000 (06:09 +0000)]
Merge "Add Battery time to location dumpsys" into pi-dev am:
b1d14ec3e1
am:
e5893a78ad
Change-Id: I1acdeaf8012f231267c9e49e0eb71527935395d6
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."
Vishwath Mohan [Thu, 29 Mar 2018 06:03:48 +0000 (06:03 +0000)]
Merge "Clear pattern on completion (if fade is enabled)." into pi-dev am:
9cfdcfaf92
am:
4cf06ff0ad
Change-Id: Idaf391f185e528416d9b2cc492582d8e014d041c
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
Rohan Shah [Thu, 29 Mar 2018 05:57:49 +0000 (05:57 +0000)]
Merge "[Notif] Remove old blocking helper button" into pi-dev am:
a0a7a86acf
am:
5649a0f76b
Change-Id: I53d75f31554a77b5a054f5a71b632e5c03e99a7e
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
Brad Stenning [Thu, 29 Mar 2018 05:49:13 +0000 (05:49 +0000)]
Merge "Add an option to display HVAC temp values in sysui" into pi-dev am:
4f4baf1e0e
am:
c009800fd4
Change-Id: I8c405b349044326c1ea93deb0f0a65de1fd0f8da
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
Hansong Zhang [Thu, 29 Mar 2018 04:10:47 +0000 (04:10 +0000)]
Merge "Bluetooth HIDD: Remove unplug()" am:
18aa649b8f am:
d8ae68626f
am:
923f5cf935
Change-Id: Ia27508b98e53bd03140dab7ac26db2a5eba847c3
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
Hall Liu [Thu, 29 Mar 2018 04:03:36 +0000 (04:03 +0000)]
Merge "Merge "Add additional logging for EMBMS edge cases" am:
de57d0d024 am:
8b8591ce46" into pi-dev-plus-aosp
am:
5d6febdc58
Change-Id: Idd01d5576472d70787a0169aefc9c60a54eaa59a
Eric Schwarzenbach [Thu, 29 Mar 2018 03:51:00 +0000 (03:51 +0000)]
Merge "Merge "Add constants for reporting criteria" into pi-dev am:
a210ef2687" into pi-dev-plus-aosp
am:
f53bcef0e1
Change-Id: I8577418f624a19dbb5126708f84499e1a9a3eab1
TreeHugger Robot [Thu, 29 Mar 2018 03:50:31 +0000 (03:50 +0000)]
Merge "Properly filter alert window notifications" into pi-dev
Holly Jiuyu Sun [Thu, 29 Mar 2018 03:40:43 +0000 (03:40 +0000)]
[automerger skipped] Merge "Address comments from API Review." am:
18e47b6108 am:
bdd350c036 -s ours
am:
dad4f435fc -s ours
Change-Id: I86356a31bda74036ab8cb241052062d2dc2163b4
Ricky Wai [Thu, 29 Mar 2018 03:34:21 +0000 (03:34 +0000)]
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev am:
b0558905c5
am:
e11325abb3
Change-Id: Id58a31c7362b3eb4c046103e58c4a31daba54f68
Mady Mellor [Thu, 29 Mar 2018 03:29:10 +0000 (03:29 +0000)]
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev am:
822dfea6ca
am:
e9761dcc70
Change-Id: I9c1333a8e36d37c7bc16cda7df6e2dce72940dfd
Matthew Ng [Thu, 29 Mar 2018 03:24:12 +0000 (03:24 +0000)]
Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev am:
9822fffc7e
am:
88bbdf3229
Change-Id: Ic6c5d9817150337d52f54d56c87c1c8750765390
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
Lucas Dupin [Thu, 29 Mar 2018 03:07:32 +0000 (03:07 +0000)]
Merge "Use sentence case on "clear all" button" into pi-dev am:
36a7eece58
am:
4ce0cea5ee
Change-Id: Iefbeb42562d2679a4976cd3353376148494a04fe
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
Matthew Ng [Thu, 29 Mar 2018 02:35:49 +0000 (02:35 +0000)]
Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev am:
6ef6c1603b
am:
247609107f
Change-Id: I4a33f6c67f64dffd17a674e6b265c8458c2d9792
Michael Wachenschwanz [Thu, 29 Mar 2018 02:28:30 +0000 (02:28 +0000)]
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev am:
631f55ba54
am:
b98ecddeba
Change-Id: Ic060c174eee29ec80d73382dc137c4a4989c84e2
Hyundo Moon [Mon, 26 Mar 2018 08:12:21 +0000 (17:12 +0900)]
MediaBrowserService: Create getCurrentBrowserInfo()
Bug:
65739365
Test: Ran MediaBrowserServiceTest
Change-Id: I629d74bcf9a08a2271463fecbacc2d998dce4387
Amin Shaikh [Thu, 29 Mar 2018 02:25:16 +0000 (02:25 +0000)]
Merge "Add vibrate/mute details to QS header." into pi-dev am:
0a27c8d329
am:
3bb59340d9
Change-Id: I3a612fd62df7705ebdd152896ddda21d1a9664fd
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
Philip P. Moltmann [Thu, 29 Mar 2018 02:13:30 +0000 (02:13 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev am:
a49954d3ab
am:
608dce4c42
Change-Id: I64a6ba4d983e606e3b4f7fe8d56825996ff1f769
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
Andreas Huber [Thu, 29 Mar 2018 02:08:47 +0000 (02:08 +0000)]
Merge "Remove no longer needed workaround for new devices that previously" into pi-dev am:
904c438135
am:
38fc4cd7ff
Change-Id: I96b7ddec575a8d371f1b65f1e36986a47da71dac
TreeHugger Robot [Thu, 29 Mar 2018 02:08:04 +0000 (02:08 +0000)]
Merge "Add Battery time to location dumpsys" into pi-dev
Sudheer Shanka [Thu, 29 Mar 2018 02:05:09 +0000 (02:05 +0000)]
Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev am:
0302f56c8f
am:
2b77c9fdd3
Change-Id: I782fea89f6cf7c8aba7c5e76a2c02a73ea72dae0
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
Felipe Leme [Thu, 29 Mar 2018 02:01:37 +0000 (02:01 +0000)]
Merge "Created framework resource for autofill_max_visible_datasets." into pi-dev am:
e845d664d1
am:
6b798834bd
Change-Id: Id41d4ea28d32edcb2acb9570e365dafb38db9f97
Elliott Hughes [Thu, 29 Mar 2018 01:54:16 +0000 (01:54 +0000)]
Merge "[automerger skipped] Merge "Remove non-tombstoned ANR path." am:
ff95c80198 am:
750409de36 -s ours" into pi-dev-plus-aosp
am:
57c6739c04 -s ours
Change-Id: I3ab5d4e401a06e9a9c6ab48eb04472bf5ba58cda
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
Android Build Merger (Role) [Thu, 29 Mar 2018 01:30:08 +0000 (01:30 +0000)]
Merge "Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev am:
e9b491bd37 am:
e5f973920f"
yuemingw [Thu, 29 Mar 2018 01:29:36 +0000 (01:29 +0000)]
Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev am:
e9b491bd37
am:
e5f973920f
Change-Id: I5ce7adb5c62c7170c3a01968348a7094f397ad10
Hansong Zhang [Thu, 29 Mar 2018 01:28:41 +0000 (01:28 +0000)]
Merge "Bluetooth HIDD: Remove unplug()"
am:
18aa649b8f
Change-Id: I2daad6cc9185c1d81dad440574e392752bece7fd
Android Build Merger (Role) [Thu, 29 Mar 2018 01:25:19 +0000 (01:25 +0000)]
Merge "Merge "docs: fixed a couple of typos" into oc-mr1-dev am:
651ffd426c am:
9a2d959eff am:
affc3087f5"
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
Joshua Baxter [Thu, 29 Mar 2018 01:24:52 +0000 (01:24 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev am:
651ffd426c am:
9a2d959eff
am:
affc3087f5
Change-Id: I1e9ea0a3ffc11090bf6d7c08b1c2354fc08809a8
Chet Haase [Thu, 29 Mar 2018 01:24:17 +0000 (01:24 +0000)]
Merge "Add targetSdk check around new LinearLayout weighted measure behavior"
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
Adam Bookatz [Thu, 29 Mar 2018 00:59:49 +0000 (00:59 +0000)]
Merge "Fix statsd ble scan logging" into pi-dev am:
f50e78d8f7
am:
e84e4239f4
Change-Id: I7d6131a38340edb856de2c92b2b12c321105efe2
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
OSDN Git Service
