OSDN Git Service
Android Build Merger (Role) [Thu, 25 Jan 2018 22:52:50 +0000 (22:52 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
am:
3a96381c69
Change-Id: Ie1fb2e5843f151447de728348a64eb0b5a8699b5
Android Build Merger (Role) [Thu, 25 Jan 2018 22:37:07 +0000 (22:37 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
am:
1ed0a31ee3 -s ours
Change-Id: I9cbde4b6406e394293ad3ad51dc6000f7c68e179
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:21:13 +0000 (22:21 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2 am:
d143bb628a
am:
d19ef3fa1b
Change-Id: I8189d3b34e4966c873e689c8c90ca6a8f2b2ec49
Android Build Merger (Role) [Thu, 25 Jan 2018 22:10:31 +0000 (22:10 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac am:
38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:56 +0000 (22:08 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c am:
876a1f75a3
am:
06e56a4086
Change-Id: I9a000a352000e4b4faf594794f9366572a98b447
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac
am:
38508aeaf5
Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2
am:
d143bb628a
Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
Android Build Merger (Role) [Thu, 25 Jan 2018 22:02:48 +0000 (22:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours
am:
ea52aec628 -s ours
Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298
Android Build Merger (Role) [Thu, 25 Jan 2018 22:01:50 +0000 (22:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours am:
78578a1294 -s ours
am:
ed4ea1e66a -s ours
Change-Id: I2eab9f0eb7f7d4e0a9f9fe7daeecb472dc9b0e9e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:08 +0000 (21:56 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c
am:
876a1f75a3
Change-Id: I0310d50282b343261575d20cda3536667c8478b9
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:02 +0000 (21:56 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours am:
d68ab1fd08 -s ours"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:55:39 +0000 (21:55 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours am:
b8bc53ecc3 -s ours
am:
d68ab1fd08 -s ours
Change-Id: Ie0da2e283b1807b5d0986433f1c7dd3c1b727a86
Mady Mellor [Thu, 25 Jan 2018 21:55:21 +0000 (21:55 +0000)]
Merge "Update Keyguard to use RowContent / ListContent instead of SliceQuery where possible"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:50 +0000 (21:53 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa
am:
981bc5a1ac
Change-Id: I2a52f4b62e872e32d07e0e994c90282fa20bc946
TreeHugger Robot [Thu, 25 Jan 2018 21:53:12 +0000 (21:53 +0000)]
Merge "VideoView2: Remove APIs supported by MediaSession"
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours
am:
78578a1294 -s ours
Change-Id: I39d1e16f34fea09009c039a955040e811988d422
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours
am:
cd4371f3cc -s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Holly Jiuyu Sun [Thu, 25 Jan 2018 21:47:46 +0000 (21:47 +0000)]
Merge "Fill in methods in EuiccCardController."
am:
197f072da2
Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
am:
806b4573aa
Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99
Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
am:
0a09cd4b21 -s ours
Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5
TreeHugger Robot [Thu, 25 Jan 2018 21:39:44 +0000 (21:39 +0000)]
Merge "Deal gracefully with cancel of nonexistent jobs"
TreeHugger Robot [Thu, 25 Jan 2018 21:32:39 +0000 (21:32 +0000)]
Merge "Update cross_profile_apps_thumbnail_enter as per task_open_enter"
TreeHugger Robot [Thu, 25 Jan 2018 21:30:22 +0000 (21:30 +0000)]
Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:"
Robert Shih [Thu, 25 Jan 2018 21:27:39 +0000 (21:27 +0000)]
Merge "MediaExtractor: getSampleSize API"
TreeHugger Robot [Thu, 25 Jan 2018 21:19:22 +0000 (21:19 +0000)]
Merge "Disable statsd that was accidentally enabled in ag/
3480570"
TreeHugger Robot [Thu, 25 Jan 2018 21:14:44 +0000 (21:14 +0000)]
Merge "Disable quick step when notification is open"
TreeHugger Robot [Thu, 25 Jan 2018 20:50:15 +0000 (20:50 +0000)]
Merge "Fade the quick scrub track when nav bar intensity changes"
TreeHugger Robot [Thu, 25 Jan 2018 20:31:07 +0000 (20:31 +0000)]
Merge "add getMetrics() apis for AudioTrack and AudioRecord"
TreeHugger Robot [Thu, 25 Jan 2018 20:18:28 +0000 (20:18 +0000)]
Merge "Fix missing textservices dump in 'adb bugreport'"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae
am:
6c1ecb973c
Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:56 +0000 (19:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours
am:
b8bc53ecc3 -s ours
Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b
Android Build Merger (Role) [Thu, 25 Jan 2018 19:21:27 +0000 (19:21 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours
am:
114cd10ac9 -s ours
Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f
TreeHugger Robot [Thu, 25 Jan 2018 19:16:47 +0000 (19:16 +0000)]
Merge "New error color"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:57 +0000 (19:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours
am:
fa70de88c5 -s ours
Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6
Calin Juravle [Thu, 25 Jan 2018 19:10:23 +0000 (19:10 +0000)]
Merge "Extend the ArtManager profiling API to cover boot image profiling"
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
am:
41ae4b7eae
Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
am:
77243e2d28 -s ours
Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd
Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93
am:
19f08130b1 -s ours
Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c
Felipe Leme [Wed, 24 Jan 2018 16:43:34 +0000 (08:43 -0800)]
Internal Framework changes needed by DocumentUI's ScopedAccessProvider:
- Changed AM.getGrantedUriPermissions() API.
- Made DocumentsContract.PATH_TREE public.
Also fixed related AM methods to use explicit for on some loops.
Bug:
63720392
Test: manual verification
Change-Id: I33bdcb949f4301534bd8467c8018d6f03b4588a4
TreeHugger Robot [Thu, 25 Jan 2018 19:02:39 +0000 (19:02 +0000)]
Merge "Tag platform protos with right privacy level."
Mike Digman [Thu, 25 Jan 2018 19:00:08 +0000 (19:00 +0000)]
Merge "Log rotation suggestion events in SystemUI"
Calin Juravle [Thu, 25 Jan 2018 18:58:09 +0000 (18:58 +0000)]
Merge "[framework] Extend profile operations to take the profile name"
yro [Thu, 25 Jan 2018 18:55:08 +0000 (10:55 -0800)]
Disable statsd that was accidentally enabled in ag/
3480570
Test: manual test
Change-Id: I57176203a1ca7d0b5639119642335e3e9a1e4e4c
TreeHugger Robot [Thu, 25 Jan 2018 18:55:45 +0000 (18:55 +0000)]
Merge "Statsd broadcasts when it is alive"
TreeHugger Robot [Thu, 25 Jan 2018 18:53:13 +0000 (18:53 +0000)]
Merge "Fix pulsing notification overlap"
Matthew Ng [Tue, 23 Jan 2018 20:39:55 +0000 (12:39 -0800)]
Disable quick step when notification is open
When notification shade is open, any swipe gestures should only affect
the notification shade. When the shade is gone, users should be able to
interact with quick step again.
Change-Id: I18bede697ae81b8010f10bf5e538d3142b39c86f
Fixes:
72185561
Test: manual
Igor Viarheichyk [Thu, 25 Jan 2018 18:47:12 +0000 (18:47 +0000)]
Merge "Fix translations detection for BCP 47 locales."
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:42:47 +0000 (18:42 +0000)]
Merge "Fix surface properties not getting applied correctly"
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:28:25 +0000 (18:28 +0000)]
Merge "Adding intent generation for dates and flights"
TreeHugger Robot [Thu, 25 Jan 2018 18:27:55 +0000 (18:27 +0000)]
Merge "Shorter date format on lock screen and AOD"
Adam Stone [Thu, 25 Jan 2018 18:25:40 +0000 (18:25 +0000)]
Merge "Enabling the getMetrics call in MediaDrm"
TreeHugger Robot [Thu, 25 Jan 2018 18:16:35 +0000 (18:16 +0000)]
Merge "Adding privacy tags to PowerManagerService proto."
Artem Iglikov [Thu, 25 Jan 2018 18:06:49 +0000 (18:06 +0000)]
Merge "Revert "Make idiomatic use of ApkAssets and AssetManager""
TreeHugger Robot [Thu, 25 Jan 2018 18:05:15 +0000 (18:05 +0000)]
Merge "Remove unused system api Window.setDisableWallpaperTouchEvents"
TreeHugger Robot [Thu, 25 Jan 2018 17:59:24 +0000 (17:59 +0000)]
Merge "Add key to store location changer"
TreeHugger Robot [Thu, 25 Jan 2018 17:57:35 +0000 (17:57 +0000)]
Merge "Add support for UsbDeviceManager to talk to USB GADGET HAL"
TreeHugger Robot [Thu, 25 Jan 2018 17:52:25 +0000 (17:52 +0000)]
Merge "Skip priv app full apk verification if has verify"
TreeHugger Robot [Thu, 25 Jan 2018 17:49:26 +0000 (17:49 +0000)]
Merge "Finish broadcast radio HAL 2.0 radio service."
TreeHugger Robot [Thu, 25 Jan 2018 17:31:38 +0000 (17:31 +0000)]
Merge "Add confirmation UI protocol to Keystore AIDL definition"
Jorim Jaggi [Thu, 25 Jan 2018 16:41:24 +0000 (17:41 +0100)]
Fix surface properties not getting applied correctly
When we switched to calling prepareSurfaces in
applySurfacesChangesTransaction, we switched from
computeShownFrameLocked to prepareSurfaceLocked, which has an
additional check of waiting for opening, which caused that a
surface size change from a layout never was applied.
The original comment on that check doesn't make sense anymore,
given that we don't animate in prepareSurfaces anymore, so we can
just go ahead and remove that check.
Test: go/wm-smoke
Test: Open voice input activity
Change-Id: I46664fd3c8f9a5c549fdb245125f05f290162ebf
Fixes:
71787613
TreeHugger Robot [Thu, 25 Jan 2018 17:24:17 +0000 (17:24 +0000)]
Merge "Generating StrongBox backed keys"
Holly Jiuyu Sun [Thu, 25 Jan 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Fill in methods in EuiccCardController."
TreeHugger Robot [Thu, 25 Jan 2018 17:18:23 +0000 (17:18 +0000)]
Merge "Fix context menu position for RTL"
TreeHugger Robot [Thu, 25 Jan 2018 17:14:11 +0000 (17:14 +0000)]
Merge "Chained attribution for GnssLocationProvider."
TreeHugger Robot [Thu, 25 Jan 2018 17:02:24 +0000 (17:02 +0000)]
Merge "Display proper block text for blocking helper"
TreeHugger Robot [Thu, 25 Jan 2018 16:52:19 +0000 (16:52 +0000)]
Merge "MediaSession2: Apply apilint"
TreeHugger Robot [Thu, 25 Jan 2018 16:50:16 +0000 (16:50 +0000)]
Merge "Add QS scrolling support"
TreeHugger Robot [Thu, 25 Jan 2018 16:48:31 +0000 (16:48 +0000)]
Merge "Add BinderProxy tracking code to SysUI."
Michal Karpinski [Thu, 25 Jan 2018 16:46:25 +0000 (16:46 +0000)]
Merge "Deprecate BackupManager#requestRestore()"
Andreas Gampe [Thu, 25 Jan 2018 16:31:58 +0000 (16:31 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test" am:
ffcf3ff77d am:
57f653a155
am:
b328fbc6b8 -s ours
Change-Id: If5a7d31d7ce73b3b3309434bb05ac1a6aeee574f
TreeHugger Robot [Thu, 25 Jan 2018 16:15:29 +0000 (16:15 +0000)]
Merge "Fixed AUTOFILL_SERVICE_DISABLED_APP and AUTOFILL_SERVICE_DISABLED_ACTIVITY."
Wale Ogunwale [Thu, 25 Jan 2018 15:29:49 +0000 (07:29 -0800)]
Remove unused system api Window.setDisableWallpaperTouchEvents
Test: builds
Change-Id: Ifd3e271a4af0bc4066747be9a147470498c39e5b
Fixes:
62263432
Andreas Gampe [Thu, 25 Jan 2018 16:10:00 +0000 (16:10 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test" am:
ffcf3ff77d
am:
57f653a155
Change-Id: I03dee58beeb6247a7786fef455eae646fb243121
TreeHugger Robot [Thu, 25 Jan 2018 16:08:15 +0000 (16:08 +0000)]
Merge "Binding on-demand #12: Log and unbind dangling TransportClients"
Android Build Merger (Role) [Thu, 25 Jan 2018 16:08:00 +0000 (16:08 +0000)]
Merge "Merge "Update CellInfo API to accomodate new fields." am:
7e73c73f89 am:
4dac182030 am:
55373d0549"
Selim Cinek [Thu, 25 Jan 2018 16:05:15 +0000 (16:05 +0000)]
Merge changes from topic "notification_launch"
* changes:
Added the reply draft as an extra to the content intent
Launching notification settings correctly inline
Launching Notification animations inline
Ray Essick [Wed, 24 Jan 2018 22:27:16 +0000 (14:27 -0800)]
add getMetrics() apis for AudioTrack and AudioRecord
add getMetrics() method to access media.metrics for AudioTrack and
AudioRecord. Includes the code paths and the sdk documentation
for the keys and what they return.
Moves the media metrics JNI support routines from media to core
to support these audiotrack/record operations being there; still
accessible to the existing operations in the media libraries.
Bug:
72179020
Bug:
72178968
Test: enhanced CTS
Change-Id: I3f05beba31aacb9b96854f8a774cb8f669ee1625
Eric Schwarzenbach [Thu, 25 Jan 2018 16:05:05 +0000 (16:05 +0000)]
Merge "Update CellInfo API to accomodate new fields." am:
7e73c73f89 am:
4dac182030
am:
55373d0549
Change-Id: I39620f4dd3afd57835c1c48e36e94f8028102edb
Jorim Jaggi [Thu, 25 Jan 2018 16:03:21 +0000 (16:03 +0000)]
Merge changes Id2832518,Ic8c128ed,Id8fde482,I99cc170b
* changes:
Revert "1/ Create display content window controller to position stacks in the display"
Revert "2/ Add support for remote Recents animation"
Revert "3/ Add input consumer to capture touches during a Recents transition"
Revert "4/ Update SysUI shared lib for Recents transition"
TreeHugger Robot [Thu, 25 Jan 2018 16:00:00 +0000 (16:00 +0000)]
Merge "WebView: document Safe Browsing as 'on' by default"
Android Build Merger (Role) [Thu, 25 Jan 2018 15:58:09 +0000 (15:58 +0000)]
Merge "Merge "Create hidden API lists" am:
b6a5c92b50 am:
265863f9d9 am:
a5cc0bb027"
TreeHugger Robot [Thu, 25 Jan 2018 15:57:35 +0000 (15:57 +0000)]
Merge "QS dnd tile triggerd dialog to turn on dnd"
David Brazdil [Thu, 25 Jan 2018 15:57:31 +0000 (15:57 +0000)]
Merge "Create hidden API lists" am:
b6a5c92b50 am:
265863f9d9
am:
a5cc0bb027
Change-Id: I6e85de117103f62cea394f7d00478ffba3ea0622
Andreas Gampe [Thu, 25 Jan 2018 15:53:05 +0000 (15:53 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test"
am:
ffcf3ff77d
Change-Id: I4c803259d993c51790c4b960251dde3a2bea9db9
Shuzhen Wang [Thu, 25 Jan 2018 15:52:45 +0000 (15:52 +0000)]
Merge "camera2: Add physical camera id in CaptureResult"
Eric Schwarzenbach [Thu, 25 Jan 2018 15:51:19 +0000 (15:51 +0000)]
Merge "Add ServiceState APIs for carrier aggregation." am:
185a89caf1 am:
d529242eea
am:
a0414ed567
Change-Id: I09b5a5955ace18d045f20a5d39b93d8e30096816
Eric Schwarzenbach [Thu, 25 Jan 2018 15:49:59 +0000 (15:49 +0000)]
Merge "Update CellInfo API to accomodate new fields." am:
7e73c73f89
am:
4dac182030
Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
Robert Berry [Thu, 25 Jan 2018 15:41:18 +0000 (15:41 +0000)]
Merge "Add flag indicating transport is device-to-device transfer"
David Brazdil [Thu, 25 Jan 2018 15:33:47 +0000 (15:33 +0000)]
Merge "Create hidden API lists" am:
b6a5c92b50
am:
265863f9d9
Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048
Daniel Sandler [Thu, 25 Jan 2018 15:33:37 +0000 (15:33 +0000)]
Merge "Apply user sentiment on ranking update."
TreeHugger Robot [Thu, 25 Jan 2018 15:32:35 +0000 (15:32 +0000)]
Merge "Display the current connected audio device"
Malcolm Chen [Thu, 25 Jan 2018 15:30:37 +0000 (15:30 +0000)]
Merge "Add slotId in INetworkService.aidl methods." am:
b1c6aa4567 am:
9348e258cd
am:
6ec70f018e
Change-Id: Ifbbdd159c3cd52282d6a4bdd58c1ddeeff4cc912
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:48 +0000 (15:23 +0000)]
Merge "Add ServiceState APIs for carrier aggregation." am:
185a89caf1
am:
d529242eea
Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
TreeHugger Robot [Thu, 25 Jan 2018 15:23:27 +0000 (15:23 +0000)]
Merge "WebView: fix docs for setAllow*AccessFromFileUrls"
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:20 +0000 (15:23 +0000)]
Merge "Update CellInfo API to accomodate new fields."
am:
7e73c73f89
Change-Id: Ib82c77d3b5559d593dbb3181add634eee251f53b
Malcolm Chen [Thu, 25 Jan 2018 15:19:06 +0000 (15:19 +0000)]
Merge "Add slotId in INetworkService.aidl methods." am:
b1c6aa4567
am:
9348e258cd
Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
David Brazdil [Thu, 25 Jan 2018 15:14:58 +0000 (15:14 +0000)]
Merge "Create hidden API lists"
am:
b6a5c92b50
Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
Narayan Kamath [Thu, 25 Jan 2018 15:13:19 +0000 (15:13 +0000)]
Merge "Support logging chained WorkSources from JobScheduler."