OSDN Git Service
Amit Mahajan [Thu, 25 Jan 2018 03:29:29 +0000 (03:29 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65 am:
e2075c2c7d
am:
fd8df8236f
Change-Id: I9590dbc72f27180e3f6e6efed1dea776074ed025
Tyler Gunn [Thu, 25 Jan 2018 03:21:03 +0000 (03:21 +0000)]
Merge "Add handover permission, fill in some missing API gaps."
Andreas Gampe [Thu, 25 Jan 2018 03:04:07 +0000 (03:04 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb am:
822e828971
am:
9c6acbd248
Change-Id: I4846f6b91fadbbd650e925c70215dea4d4459278
Amit Mahajan [Thu, 25 Jan 2018 02:59:04 +0000 (02:59 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65
am:
e2075c2c7d
Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
TreeHugger Robot [Thu, 25 Jan 2018 02:49:35 +0000 (02:49 +0000)]
Merge "Clear parent wants focus on strong focus gain."
Andreas Gampe [Thu, 25 Jan 2018 02:48:37 +0000 (02:48 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb
am:
822e828971
Change-Id: I0481e40c91e5848fc7ab551a794269d9379cbcc9
Chong Zhang [Thu, 25 Jan 2018 02:47:59 +0000 (02:47 +0000)]
Merge "MediaCodec: expose constant quality mode"
Amit Mahajan [Thu, 25 Jan 2018 02:44:09 +0000 (02:44 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
am:
7b9a785d65
Change-Id: I3f329aea9d90ced822c119f079d0a70a562f44a3
Andreas Gampe [Thu, 25 Jan 2018 02:40:28 +0000 (02:40 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
am:
25e50ccccb
Change-Id: I085cfc11effb8f067bd8fc122ec88bd6c44a2525
TreeHugger Robot [Thu, 25 Jan 2018 02:05:30 +0000 (02:05 +0000)]
Merge changes from topic "assetmanager-refactor"
* changes:
libandroidfw: Improve performance of AssetManager2
libandroidfw: Add ApplyStyle and SetConfiguration benchmark
Make idiomatic use of ApkAssets and AssetManager
Replace AssetManager with AssetManager2 implementation
TreeHugger Robot [Thu, 25 Jan 2018 02:04:11 +0000 (02:04 +0000)]
Merge "Add statsd microbenchmark and fix a crash in LogEvent"
TreeHugger Robot [Thu, 25 Jan 2018 01:49:22 +0000 (01:49 +0000)]
Merge "Add flag to SysUI for Hybrid notification"
Treehugger Robot [Thu, 25 Jan 2018 01:33:33 +0000 (01:33 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
TreeHugger Robot [Thu, 25 Jan 2018 01:31:34 +0000 (01:31 +0000)]
Merge changes I8d43f5bc,I5ca4b0ca
* changes:
OMS: Enable uninstallation of overlays
PackageManager: allow overlays to be installed when signature matches platform cert
David Brazdil [Thu, 25 Jan 2018 01:20:47 +0000 (01:20 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca am:
97a970e56b
am:
5fab14313b
Change-Id: I788ad36976b6c63670f40c735380982e6567df86
David Brazdil [Thu, 25 Jan 2018 01:12:33 +0000 (01:12 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca
am:
97a970e56b
Change-Id: I73eaa052597d225aa673dd479977b0ce7a7d6d64
David Brazdil [Thu, 25 Jan 2018 01:06:15 +0000 (01:06 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
am:
50cfaa40ca
Change-Id: I7aa3c86bae54b4f55cbb5cfe8ddf076fedf6177b
Ningyuan Wang [Thu, 25 Jan 2018 01:03:15 +0000 (01:03 +0000)]
Merge "Remove WifiManager 'scanWithTraffic' APIs"
Mukesh Agrawal [Thu, 25 Jan 2018 00:59:47 +0000 (00:59 +0000)]
Merge changes I72baa5ca,I0366341a
* changes:
WifiConfiguration: deprecate WPA-1 related fields
WifiConfiguration: deprecate WEP-related fields
Andreas Gampe [Thu, 25 Jan 2018 00:56:11 +0000 (00:56 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
Nathan Harold [Thu, 25 Jan 2018 00:48:43 +0000 (00:48 +0000)]
Merge changes from topic "keepalive-on-cell"
* changes:
Rework KeepalivePacketData for Compatibility with Cell
Add Constants for NATT Keepalive to RILConstants
Relocate KeepalivePacketData to frameworks/base
Beverly Tai [Thu, 25 Jan 2018 00:47:07 +0000 (00:47 +0000)]
Merge "QS DND tile secondary text added"
Leif Wilden [Thu, 25 Jan 2018 00:35:26 +0000 (00:35 +0000)]
Merge "Unrevert "Move instrumentation classes to SettingsLib to share between mobile/TV."""
Lingfeng Yang [Thu, 25 Jan 2018 00:31:34 +0000 (00:31 +0000)]
Merge "Don't use shader disk cache on emulator"
Victor Hsieh [Thu, 25 Jan 2018 00:25:16 +0000 (00:25 +0000)]
Merge "Enable verity to updated priv app if root hash exists"
Tyler Gunn [Mon, 22 Jan 2018 23:17:54 +0000 (15:17 -0800)]
Add handover permission, fill in some missing API gaps.
Adding the ACCEPT_HANDOVER runtime permission which an app must have in
order to accept handovers (this is per design).
Adding missing onHandoverComplete method in the android.telecom.Connection
API (per design).
Finishing plumbing for android.telecom.Call#onHandoverComplete API.
Fix issue where the new handover API methods would never get called; the
legacy handover extra was being used in this case when it should not have
been.
Bug:
65415068
Test: Verified using new CTS tests
Change-Id: If1558f6a23911862c02ac5b18fb62d86911ed7e2
Evan Rosky [Thu, 25 Jan 2018 00:08:03 +0000 (00:08 +0000)]
Merge "Expose selector draw condition for test"
TreeHugger Robot [Wed, 24 Jan 2018 23:57:47 +0000 (23:57 +0000)]
Merge "MAC Randomization: Store Randomized MAC Address in WifiConfiguration"
Calin Juravle [Wed, 24 Jan 2018 23:48:18 +0000 (23:48 +0000)]
Merge "Accept UserHandle.USER_ALL during profile preparation"
Jeremy Klein [Wed, 24 Jan 2018 23:46:11 +0000 (23:46 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46 am:
8c33c789ed
am:
4ec192fd26
Change-Id: Ieae2e96acac3f1372d4075145426065f666a221a
Android Build Merger (Role) [Wed, 24 Jan 2018 23:38:15 +0000 (23:38 +0000)]
Merge "Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2 am:
596c22a84d am:
07b212b788"
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:37:16 +0000 (23:37 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2 am:
596c22a84d
am:
07b212b788
Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819
TreeHugger Robot [Wed, 24 Jan 2018 23:36:19 +0000 (23:36 +0000)]
Merge "ActivityManager: add API for wifi bug report"
Jeremy Klein [Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46
am:
8c33c789ed
Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
Steven Moreland [Wed, 24 Jan 2018 23:32:38 +0000 (23:32 +0000)]
Merge "Allow HIDL to be used in priv-apps."
Pankaj Kanwar [Wed, 24 Jan 2018 23:27:27 +0000 (23:27 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev am:
e2bc2efe3c
am:
43a3671a42 -s ours
Change-Id: Ie98d1e6aee39427d2ec87dcea50aed9bf0ead023
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:24:29 +0000 (23:24 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2
am:
596c22a84d
Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
Tobias Thierer [Wed, 24 Jan 2018 23:19:33 +0000 (23:19 +0000)]
Merge "Deprecate android.util.Mutable*."
Adam Lesinski [Tue, 9 Jan 2018 01:38:30 +0000 (17:38 -0800)]
libandroidfw: Improve performance of AssetManager2
AssetManager2 relied on creating a list of configurations
present in the resource table so as to avoid copying and
converting ResTable_config's from the APK on every
resource retrieval.
ResTable, however, had a better optimization that pruned
the configurations that didn't match the currently set
configuration. This vastly reduced the number of ResTable_configs
to test.
In this CL, AssetManager2 follows suite with this optimization
and only maintains the filtered ResTable_configs, falling back
to the slow path when the configuration is overridden.
Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: I5d46f8b005a37b72750d00bd75f090e7b5a36f60
Adam Lesinski [Thu, 28 Dec 2017 21:01:35 +0000 (13:01 -0800)]
libandroidfw: Add ApplyStyle and SetConfiguration benchmark
Test: mma frameworks/base/libs/androidfw
Test: adb sync system data
Test: adb shell /data/benchmarktest64/libandroidfw_benchmarks/libandroidfw_benchmarks
Change-Id: Ia6b441f186ccb455acbee15723f0d2d5657b09b5
Adam Lesinski [Sat, 2 Dec 2017 02:22:37 +0000 (18:22 -0800)]
Make idiomatic use of ApkAssets and AssetManager
Move away from using deprecated addAssetPath methods
and cache the instances of ApkAssets created.
Test: CTS passes
Change-Id: I257c72261a97e4aa802abb46dc1f44d80e1d42ad
Adam Lesinski [Mon, 23 Jan 2017 20:58:11 +0000 (12:58 -0800)]
Replace AssetManager with AssetManager2 implementation
Test: atest CtsContentTestCases:android.content.res.cts
Test: make libandroidfw_tests
Change-Id: I572eb13c6a4372c7f656f5912821cececd5bf3d4
Pankaj Kanwar [Wed, 24 Jan 2018 23:14:30 +0000 (23:14 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
am:
e2bc2efe3c
Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd
Jeremy Klein [Wed, 24 Jan 2018 23:13:31 +0000 (23:13 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
am:
d3dac85e46
Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e
Chong Zhang [Mon, 22 Jan 2018 23:40:38 +0000 (15:40 -0800)]
MediaCodec: expose constant quality mode
Also fix a bug where the supported bitcontrol mode
bitmask is wrong.
bug:
63633199
Change-Id: Ib2c21b0d846bcc31f61027d875f801a2282c1101
Derek Sollenberger [Wed, 24 Jan 2018 23:09:53 +0000 (23:09 +0000)]
Merge "Fix bug in ImageDecoder which provided the incorrect density to NinePatchDrawables"
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:05:25 +0000 (23:05 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
am:
ec44a402d2
Change-Id: I6ded59329716f073b30964940ab6574360406778
Pankaj Kanwar [Wed, 24 Jan 2018 23:02:22 +0000 (23:02 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
Howard Ro [Wed, 24 Jan 2018 23:00:14 +0000 (23:00 +0000)]
Merge "Fix adb shell cmd config remove command when no (uid, id) pair is specified."
Calin Juravle [Wed, 24 Jan 2018 22:43:24 +0000 (14:43 -0800)]
Accept UserHandle.USER_ALL during profile preparation
Test: adb install foo.apk
Bug:
72453027
Change-Id: I840d70d47a256c8853bbe1b9b023f51bdd5ddf6b
Android Build Merger (Role) [Wed, 24 Jan 2018 22:44:52 +0000 (22:44 +0000)]
Merge "Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am:
2a8c24be18 am:
6dea42ae0f am:
2a21a9c997 -s ours"
David Brazdil [Wed, 24 Jan 2018 22:44:30 +0000 (22:44 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am:
2a8c24be18 am:
6dea42ae0f
am:
2a21a9c997 -s ours
Change-Id: I36d988ae251bcee837a0f3ab7630fd82d099adc8
Android Build Merger (Role) [Wed, 24 Jan 2018 22:39:45 +0000 (22:39 +0000)]
Merge "Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am:
7a481bde6d am:
f343e33dd5 am:
e39de15109"
Tyler Gunn [Wed, 24 Jan 2018 22:38:52 +0000 (22:38 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am:
7a481bde6d am:
f343e33dd5
am:
e39de15109
Change-Id: I48b1c82a051342b6a4504290a6297aebc8a2bdfd
Wei Jia [Wed, 24 Jan 2018 22:35:43 +0000 (22:35 +0000)]
Merge "add MediaPlayer2"
Android Build Merger (Role) [Wed, 24 Jan 2018 22:33:21 +0000 (22:33 +0000)]
Merge "Merge "Added network service interface" am:
71793be6bb am:
2b06789511 am:
3748d15321"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 22:32:56 +0000 (22:32 +0000)]
Merge "Added network service interface" am:
71793be6bb am:
2b06789511
am:
3748d15321
Change-Id: Ia08a840e47d3372772a105ef7b65bb259d07e7f8
Mohamed Abdalkader [Wed, 24 Jan 2018 22:32:39 +0000 (22:32 +0000)]
Merge "Remove internal version of SMS apis"
TreeHugger Robot [Wed, 24 Jan 2018 22:31:24 +0000 (22:31 +0000)]
Merge "Statsd always includes snapshot of uid map."
Amit Mahajan [Wed, 24 Jan 2018 20:54:44 +0000 (12:54 -0800)]
Update comments for ACTION_CARRIER_CONFIG_CHANGED.
Test: none
Bug:
64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
Jorim Jaggi [Wed, 24 Jan 2018 22:15:36 +0000 (22:15 +0000)]
Merge "Fix NPE from refactoring"
Kweku Adams [Thu, 28 Dec 2017 01:03:39 +0000 (17:03 -0800)]
Removing JobStorePersistStats STOPSHIP comment.
The linked bug is fixed.
Bug:
64536115
Test: N/A
Change-Id: Ic89b2d9b24b88459058c304e08f3f5c8de974081
Jaewan Kim [Wed, 24 Jan 2018 22:12:04 +0000 (22:12 +0000)]
Merge "MediaSession2: Last changes before API unhide"
TreeHugger Robot [Wed, 24 Jan 2018 22:09:24 +0000 (22:09 +0000)]
Merge "Fix inconsistent MagnificationGestureHandler state after delegation"
TreeHugger Robot [Wed, 24 Jan 2018 22:08:22 +0000 (22:08 +0000)]
Merge "Add deep link to the assisted dialing settings."
TreeHugger Robot [Wed, 24 Jan 2018 22:07:13 +0000 (22:07 +0000)]
Merge "Compute full text layout in MeasuredText and use it for drawing"
TreeHugger Robot [Wed, 24 Jan 2018 22:04:09 +0000 (22:04 +0000)]
Merge "[QS] Update night light time from 24 to 12-hr"
John Reck [Wed, 24 Jan 2018 21:51:06 +0000 (21:51 +0000)]
Merge "Limit ripple alpha to 50%"
Treehugger Robot [Wed, 24 Jan 2018 21:49:00 +0000 (21:49 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
TreeHugger Robot [Wed, 24 Jan 2018 21:45:07 +0000 (21:45 +0000)]
Merge "Slider always represents absolute brightness"
David Brazdil [Wed, 24 Jan 2018 21:43:47 +0000 (21:43 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am:
2a8c24be18
am:
6dea42ae0f
Change-Id: I6376e610c575cd7c3f7bf8a72ca4c1a92d9023cc
TreeHugger Robot [Wed, 24 Jan 2018 21:43:24 +0000 (21:43 +0000)]
Merge "Update font config name."
David Brazdil [Wed, 17 Jan 2018 18:06:47 +0000 (18:06 +0000)]
Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps
When forking a process for a system app, pass a flag to ART that
will disable enforcement of hidden API access checks.
Test: manual
Bug:
64382372
Change-Id: I5ba81d84a44c9467613f060428b11e1d9d725bd3
TreeHugger Robot [Wed, 24 Jan 2018 21:39:35 +0000 (21:39 +0000)]
Merge "Fix location INTERACT_ACROSS_USERS bug"
David Brazdil [Wed, 24 Jan 2018 21:36:44 +0000 (21:36 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
am:
2a8c24be18
Change-Id: I51ce5aa51ca72200639244caa018323911cc54ae
Andreas Gampe [Wed, 24 Jan 2018 21:25:22 +0000 (13:25 -0800)]
BitmapDrawable: Suppress errorprone warning
Suppress a warning for constructor-chaining not using all parameters.
Bug:
72451126
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie47dec119ec578b79d866d9c5041bb7b68eac146
TreeHugger Robot [Wed, 24 Jan 2018 21:19:18 +0000 (21:19 +0000)]
Merge "Adding comment to alarmmanagerservice.proto."
Holly Jiuyu Sun [Wed, 24 Jan 2018 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
TreeHugger Robot [Wed, 24 Jan 2018 21:07:21 +0000 (21:07 +0000)]
Merge "Remove unused argument LayoutOverhang"
Tyler Gunn [Wed, 24 Jan 2018 21:06:48 +0000 (21:06 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am:
7a481bde6d
am:
f343e33dd5
Change-Id: Ia3e538e18d4fdf1770ee15b06d256c6e79051ebf
Evan Laird [Wed, 24 Jan 2018 21:06:37 +0000 (21:06 +0000)]
Merge "Add status bar icons to QQS"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:55:01 +0000 (20:55 +0000)]
Merge "Added network service interface" am:
71793be6bb
am:
2b06789511
Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79
Tyler Gunn [Wed, 24 Jan 2018 20:48:55 +0000 (20:48 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."
am:
7a481bde6d
Change-Id: I7d9f84b2240b1c961675b6ab6937dc952f44bd2d
TreeHugger Robot [Wed, 24 Jan 2018 20:45:52 +0000 (20:45 +0000)]
Merge "DND qs tile primary text is always Do not disturb"
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:44:04 +0000 (20:44 +0000)]
Merge "Added network service interface"
am:
71793be6bb
Change-Id: I2dab9576e8fc32f914225620733ad83b7c808015
Andy Hung [Wed, 24 Jan 2018 20:28:46 +0000 (20:28 +0000)]
Merge "AudioSystem: Inform AudioFlinger of total memory"
Treehugger Robot [Wed, 24 Jan 2018 20:28:21 +0000 (20:28 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
TreeHugger Robot [Wed, 24 Jan 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Fingerprint data is now stored in one of two ways depending on the"
Lingfeng Yang [Wed, 24 Jan 2018 18:40:18 +0000 (10:40 -0800)]
Don't use shader disk cache on emulator
bug:
71900691
Emulator user might switch renderers, migrate a snapshot to a different
machine with a different shader binary format, etc.
Plus, program binaries don't seem to work so well on some desktop GPUs.
Change-Id: I0c6239acbd556097494aa903d6603c963d3141cb
Antoan Angelov [Wed, 24 Jan 2018 20:11:54 +0000 (20:11 +0000)]
Merge changes from topic "dpc-migration-atomic"
* changes:
Notify DO after PO ownership transfer when they belong to affiliated users.
Tests for owner transfer atomicity.
Make owner transfer an atomic operation.
Vladislav Kuzkokov [Wed, 24 Jan 2018 20:11:31 +0000 (20:11 +0000)]
Merge "Fix Printing policy in profile owner."
Benedict Wong [Wed, 24 Jan 2018 20:07:20 +0000 (20:07 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50 am:
02d6d81006
am:
3b181e9ef7
Change-Id: I998d44bac0993a8f2e9e228a0b0a80adfaa4d87e
TreeHugger Robot [Wed, 24 Jan 2018 20:02:47 +0000 (20:02 +0000)]
Merge changes I204d0ba7,Ifc51143b,I4b15fac9
* changes:
Show swipe up onboarding after 2 apps instead of 3
Change swipe up onboarding color based on nav bar color
Add swipe up onboarding from apps
Android Build Merger (Role) [Wed, 24 Jan 2018 19:59:42 +0000 (19:59 +0000)]
Merge "Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113 am:
a8505da2a6 am:
82a6cf1597"
Jaewan Kim [Wed, 24 Jan 2018 17:24:03 +0000 (02:24 +0900)]
MediaSession2: Last changes before API unhide
This CL includes
- Rename SessionToken to SessionToken2
- Add repeat/shuffle mode support in PlaylistParam
- Add Executor params in session builder
- Add more APIs for MediaPlayerBase
Test: Run all MediaComponents tests once
Change-Id: Ia61632b7a09fab7f41fd89e9489a01af13d6c3c2
Jack He [Wed, 24 Jan 2018 19:58:35 +0000 (19:58 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113 am:
a8505da2a6
am:
82a6cf1597
Change-Id: Ibb358a8270867752ce834429f914db21ec1c4c7d
Jaewan Kim [Wed, 24 Jan 2018 19:58:02 +0000 (19:58 +0000)]
Merge "Change MediaControlView2 APIs"
Benedict Wong [Wed, 24 Jan 2018 19:56:24 +0000 (19:56 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50
am:
02d6d81006
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
TreeHugger Robot [Wed, 24 Jan 2018 19:51:22 +0000 (19:51 +0000)]
Merge "Fix deadlock for write-disk cmd."