OSDN Git Service
Shijian Li [Thu, 12 Jan 2017 03:19:25 +0000 (03:19 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
ae21066a59
am:
f8d62ca359
Change-Id: I4c4130790fbfc56cb952fc076fd2be611bf51b1f
Shijian Li [Thu, 12 Jan 2017 03:18:09 +0000 (03:18 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
699e7878ef
am:
7eed086b86
Change-Id: I33321847b4e945498bf4ca4c9840605cd9d31947
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
ae21066a59
Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
699e7878ef
Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
Shijian Li [Thu, 12 Jan 2017 03:07:10 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf
TreeHugger Robot [Thu, 12 Jan 2017 02:55:12 +0000 (02:55 +0000)]
Merge "Remove libservicestestsjni"
Yifan Hong [Thu, 12 Jan 2017 02:20:03 +0000 (02:20 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15 am:
e0707f139d am:
860ef8810d
am:
be7a9b89f4
Change-Id: Iac121abc1603f4739a61b8efc6ce7361656d16ba
Tim Murray [Thu, 12 Jan 2017 02:14:18 +0000 (02:14 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am:
0b7b79a882
am:
d8ecc93ca0
Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841
Yifan Hong [Thu, 12 Jan 2017 02:14:00 +0000 (02:14 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15 am:
e0707f139d
am:
860ef8810d
Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15
am:
e0707f139d
Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am:
d8384b5c15
Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"
Tim Murray [Thu, 12 Jan 2017 01:13:44 +0000 (17:13 -0800)]
resolve merge conflicts of
8d7b18292b63 to master
Change-Id: Id59ab691bfdb98cff179dfa23e3ddb185e646f53
Tim Murray [Thu, 12 Jan 2017 00:32:01 +0000 (00:32 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
am:
0b7b79a882
Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c
Tim Murray [Thu, 12 Jan 2017 00:31:54 +0000 (00:31 +0000)]
add additional logging to ActiityManagerService
am:
82e201f03d
Change-Id: I0ea737adc3f59674a0ce313a0a8caa49d926e359
Hakan Seyalioglu [Thu, 12 Jan 2017 00:26:59 +0000 (00:26 +0000)]
Merge "Fix some issues with the last used entry"
Tim Murray [Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.
Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
TreeHugger Robot [Wed, 11 Jan 2017 23:48:13 +0000 (23:48 +0000)]
Merge "Do not report boot timings on first boot or runtime restart"
TreeHugger Robot [Wed, 11 Jan 2017 23:43:15 +0000 (23:43 +0000)]
Merge "BpBase -> BpHwBase"
Yorke Lee [Wed, 11 Jan 2017 23:41:52 +0000 (23:41 +0000)]
Merge "Don't clamp override config to screen area for freeform task"
Etan Cohen [Wed, 11 Jan 2017 23:28:20 +0000 (23:28 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am:
dfe8f5dc13 am:
2a4e3bef2c am:
b32dfa4ef5
am:
3fc5b186fa
Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac
Etan Cohen [Wed, 11 Jan 2017 23:22:51 +0000 (23:22 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am:
dfe8f5dc13 am:
2a4e3bef2c
am:
b32dfa4ef5
Change-Id: If2a6b632cd03984921572b190745865953a8e808
Felipe Leme [Wed, 11 Jan 2017 23:18:28 +0000 (23:18 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev am:
2729bb8517
am:
2a57dd77e3 -s ours
Change-Id: I288d28b63b1123096e6d036f34edbb919d8889ff
Felipe Leme [Wed, 11 Jan 2017 23:17:22 +0000 (23:17 +0000)]
Added BUGREPORT_OPTION_TELEPHONY. am:
a561b1f9c0
am:
c88368c270 -s ours
Change-Id: I9f8dc4d1ef90c98a5436b044407497d9f470098d
Etan Cohen [Wed, 11 Jan 2017 23:17:19 +0000 (23:17 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am:
dfe8f5dc13
am:
2a4e3bef2c
Change-Id: I6f894d92451032657678639c3021eef07289a6a2
Etan Cohen [Wed, 11 Jan 2017 23:12:16 +0000 (23:12 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am:
dfe8f5dc13
Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
Felipe Leme [Wed, 11 Jan 2017 23:09:30 +0000 (23:09 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
am:
2729bb8517
Change-Id: Idfef7bea67e3f75bc5faad6e325c4197c4904652
Felipe Leme [Wed, 11 Jan 2017 23:09:01 +0000 (23:09 +0000)]
Added BUGREPORT_OPTION_TELEPHONY.
am:
a561b1f9c0
Change-Id: I063a0d6c4c66035082789d4361b649439da00bf9
Etan Cohen [Wed, 11 Jan 2017 22:59:24 +0000 (22:59 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
TreeHugger Robot [Wed, 11 Jan 2017 22:55:34 +0000 (22:55 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
Jeff Schumacher [Wed, 11 Jan 2017 22:34:27 +0000 (22:34 +0000)]
Merge "Made ActivityManager.forceStopPackage a @SystemApi"
Fyodor Kupolov [Wed, 11 Jan 2017 02:34:10 +0000 (18:34 -0800)]
Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.
The following metrics were updated:
- boot_system_server_init - check added for consistency with other
metrics in SystemServer. The metric is actually unaffected by first boot,
because dexopt will start later
- boot_package_manager_init_ready
- boot_system_server_init
- framework_locked_boot_completed
- framework_boot_completed
Test: manual + UserControllerTest pass
Bug:
32807863
Change-Id: Iff13697b7d4f9ff8439e1e932d7e276f48cd5c37
Aurimas Liutikas [Wed, 11 Jan 2017 22:06:03 +0000 (22:06 +0000)]
Merge "Remove unused com.android.internal.widget.Smileys class"
Phil Weaver [Wed, 11 Jan 2017 21:57:05 +0000 (21:57 +0000)]
Merge "Add flag and listener for a11y volume requests."
Makoto Onuki [Wed, 11 Jan 2017 21:56:20 +0000 (21:56 +0000)]
Merge "Expose getApplicationInfo(UserHandle)"
Hakan Seyalioglu [Sat, 7 Jan 2017 03:54:43 +0000 (19:54 -0800)]
Fix some issues with the last used entry
Delay a few operations until after the async phase which rely on display
info being retrieved for resolve targets until after they are available.
Also fix a smaller bug where the list header may be appended multiple
times on activity recreation. Wanted to submit this while writing unit
tests still in progress since there's an open P1 on this for dogfood.
bug:
34103288,
34128854,
34127768
Test: Manual testing - writing unit tests in progress.
Change-Id: I47f747a7493f47863a0107cd8054901bab494462
Tim Murray [Wed, 11 Jan 2017 17:52:38 +0000 (09:52 -0800)]
add additional logging to ActiityManagerService
add logging to help debugging issues with attachApplication/attachApplicationLocked.
bug
34193533
Tests: boots and starts apps
Change-Id: I6ef46dd92e893b71c164bfb28eeba1835dddffee
TreeHugger Robot [Wed, 11 Jan 2017 21:19:55 +0000 (21:19 +0000)]
Merge "Fix Skia merge by fixing API mismatch."
TreeHugger Robot [Wed, 11 Jan 2017 21:19:24 +0000 (21:19 +0000)]
Merge "DozeService: Fix crash if StatusBar not yet initialized"
Makoto Onuki [Wed, 11 Jan 2017 21:14:16 +0000 (21:14 +0000)]
Merge "@hide RetentionPolicy.SOURCE annotation"
TreeHugger Robot [Wed, 11 Jan 2017 21:12:55 +0000 (21:12 +0000)]
Merge "Refactor ExpandableNotiRow"
TreeHugger Robot [Wed, 11 Jan 2017 21:11:01 +0000 (21:11 +0000)]
Merge "Make hidden DevicePolicyManager#getDeviceOwnerComponentOnAnyUser system API."
TreeHugger Robot [Wed, 11 Jan 2017 20:55:05 +0000 (20:55 +0000)]
Merge "Fix dirty Z prop"
Selim Cinek [Wed, 11 Jan 2017 20:52:56 +0000 (20:52 +0000)]
Merge changes Iedf3172f,I62aa349b,I38c6970b
* changes:
Using a different interpolator when unlocking to an app
Adapted the shade closing interpolator
Fixed the appearing of the statusbar icons
Yorke Lee [Tue, 10 Jan 2017 15:58:59 +0000 (07:58 -0800)]
Don't clamp override config to screen area for freeform task
Bug:
34180907
Test: run cts --module CtsDpiTestCases
Test: run cts --module CtsContentTestCases
Change-Id: I07d979e33c7fb623ab495b08ae5ae35b5e768526
TreeHugger Robot [Wed, 11 Jan 2017 20:45:37 +0000 (20:45 +0000)]
Merge "Added BUGREPORT_OPTION_TELEPHONY."
TreeHugger Robot [Wed, 11 Jan 2017 20:38:54 +0000 (20:38 +0000)]
Merge "Show work unlock prompt on focus as well as touch"
Jeremy Joslin [Wed, 11 Jan 2017 20:16:08 +0000 (20:16 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am:
b5488ec3b3 am:
425a0fdc95 am:
ab9eb11e2f
am:
ad9ff9c59a -s ours
Change-Id: I990d6c6a3aa7ad0fd170ba2b2d0c8a7c75232fe7
Jeremy Joslin [Wed, 11 Jan 2017 20:08:49 +0000 (20:08 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am:
b5488ec3b3 am:
425a0fdc95
am:
ab9eb11e2f
Change-Id: Iede47bf5a625ac4183919b4253c6d5e3f92520bc
Jeremy Joslin [Wed, 11 Jan 2017 19:59:27 +0000 (19:59 +0000)]
Merge "Move getActiveScorerPackage() to the score service." am:
b5488ec3b3
am:
425a0fdc95
Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
Derek Sollenberger [Wed, 11 Jan 2017 16:09:48 +0000 (11:09 -0500)]
Fix Skia merge by fixing API mismatch.
Test: compile
Change-Id: Ie524af03fd3c85cceac13abdcdd9af8ef6ca6bb9
Adrian Roos [Tue, 3 Jan 2017 20:13:49 +0000 (12:13 -0800)]
DozeService: Fix crash if StatusBar not yet initialized
Fixes a bug where a crashing SystemUI may crash again after restarting
if the services restart in an unexpected order.
Bug:
34044765
Test: Crash SystemUI, observe that it doesn't crash again right away.
Change-Id: Id6f781ba29ff11be0850b1883ca2942f15e76324
Jerome Gaillard [Wed, 11 Jan 2017 19:54:44 +0000 (19:54 +0000)]
Merge "Separate render and verify in tests"
Jeremy Joslin [Wed, 11 Jan 2017 19:52:37 +0000 (19:52 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
am:
b5488ec3b3
Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c
Treehugger Robot [Wed, 11 Jan 2017 19:40:44 +0000 (19:40 +0000)]
Merge "Move getActiveScorerPackage() to the score service."
TreeHugger Robot [Wed, 11 Jan 2017 19:39:03 +0000 (19:39 +0000)]
Merge "Add missing break statement to fix cts test"
TreeHugger Robot [Wed, 11 Jan 2017 19:35:19 +0000 (19:35 +0000)]
Merge "Add one-shot plugin support"
John Reck [Wed, 11 Jan 2017 19:26:43 +0000 (11:26 -0800)]
Fix dirty Z prop
Test: none
Change-Id: I886d50e58d6f404c6d19860a3032ca1b2854e073
Adrian Roos [Wed, 11 Jan 2017 19:18:48 +0000 (11:18 -0800)]
Refactor ExpandableNotiRow
Test: manual
Change-Id: I00e2b7ed3b710d3d6b656dfabec209bb8b22f390
TreeHugger Robot [Wed, 11 Jan 2017 19:14:52 +0000 (19:14 +0000)]
Merge "Added TaskWindowContainerController"
TreeHugger Robot [Wed, 11 Jan 2017 19:13:33 +0000 (19:13 +0000)]
Merge "Do not select an importance for unspecified notifications"
Etan Cohen [Tue, 10 Jan 2017 05:47:32 +0000 (21:47 -0800)]
[AWARE] Unhide Wi-Fi Aware API (baseline)
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).
Bug:
30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
Greg Daniel [Wed, 11 Jan 2017 19:01:49 +0000 (19:01 +0000)]
Merge "Add support for dummy draws for Vulkan webview and texture views."
Tao Bai [Wed, 11 Jan 2017 19:01:22 +0000 (19:01 +0000)]
Merge "Load WebViewChromiumFactoryProviderForO"
Greg Daniel [Wed, 11 Jan 2017 19:00:31 +0000 (19:00 +0000)]
Merge "Break Layer class into Gl and Vulkan subclasses"
TreeHugger Robot [Wed, 11 Jan 2017 18:56:35 +0000 (18:56 +0000)]
Merge "Add new system api to pass parameters from Oobconfig to ManagedProvisioning"
Andrii Kulian [Wed, 11 Jan 2017 18:46:56 +0000 (18:46 +0000)]
Merge "Fix typo that caused excessive display config updates"
phweiss [Wed, 11 Jan 2017 18:43:02 +0000 (18:43 +0000)]
Add ticker text for network logging notification am:
df7bfcfc22
am:
8b2472a428
Change-Id: I177295c148dd076889a64ab839d71e56de6e78a8
phweiss [Wed, 11 Jan 2017 18:37:58 +0000 (18:37 +0000)]
Add ticker text for network logging notification
am:
df7bfcfc22
Change-Id: Iff2f2e9866eb9b4bc018965bdd48eaff5bbc9af3
TreeHugger Robot [Wed, 11 Jan 2017 18:33:18 +0000 (18:33 +0000)]
Merge "Use bitfields in GNSS HAL"
Makoto Onuki [Wed, 11 Jan 2017 18:13:00 +0000 (18:13 +0000)]
Merge "Update the javadoc on requestPinShortcut() about multiple..."
Shijian Li [Wed, 11 Jan 2017 17:32:12 +0000 (17:32 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package
name when starting the activity now.
Bug:
34216066
Change-Id: Ic8c8576ce2c65bc554bbf4794e169838c2ccbbe1
Alison Cichowlas [Wed, 11 Jan 2017 17:54:11 +0000 (17:54 +0000)]
Merge "Add a required main category for multi logs."
Robin Lee [Wed, 11 Jan 2017 17:46:55 +0000 (17:46 +0000)]
Show work unlock prompt on focus as well as touch
With change I4576aaafa141ef5297f9c18935b747693a80f0fd we can be
reasonably sure this isn't going to instantly bring the prompt into
fullscreen, since launching this activity as an overlay in an
unfocused task won't bring it to the front.
But if it's launched in a focused task, it will get focused and
brought to the front, starting the unlock process. This saves us a
click, and user frustration, and is generally a good thing.
Bug:
31001762
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest (harness)
Change-Id: Ic5a33589e2b63d04e47c5f166da0077188cb55ea
Geoffrey Pitsch [Wed, 11 Jan 2017 17:48:09 +0000 (12:48 -0500)]
Do not select an importance for unspecified notifications
Test: runtest systemui-notification
Bug:
34164846
Change-Id: I4988ce26264853fd9ab84ae02e995641edf933cd
Robin Lee [Wed, 11 Jan 2017 17:40:58 +0000 (17:40 +0000)]
Merge changes I3fd28e69,If43820b6
* changes:
Lock work tasks from SystemUI instead of ActivityStarter
Bounce work challenge through a WorkLockActivity
TreeHugger Robot [Wed, 11 Jan 2017 17:22:51 +0000 (17:22 +0000)]
Merge "Revert "Update active fingerprint group when switching profiles""
Wale Ogunwale [Fri, 16 Dec 2016 02:27:00 +0000 (18:27 -0800)]
Added TaskWindowContainerController
For linking TaskRecord in AMS to Task window container in WMS.
Bug:
30060889
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: Existing test pass and manual testing.
Change-Id: I16248f3e96e5087ba24198a48a3bd10a12ae76a6
Akira Oshimi [Wed, 11 Jan 2017 17:18:09 +0000 (17:18 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am:
e3677865a8 am:
49b68ad0cd am:
d999e53487
am:
fb6616a6a6
Change-Id: Id4a4ef2672c614ac4343becf238f654c8e83caa5
Mark Salyzyn [Wed, 11 Jan 2017 17:12:59 +0000 (17:12 +0000)]
Merge "resolve merge conflicts of
082a1721b516 to master"
Felipe Leme [Thu, 5 Jan 2017 22:57:12 +0000 (14:57 -0800)]
Added BUGREPORT_OPTION_TELEPHONY.
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.
BUG:
32589463
BUG:
26849505
Test: manual
Change-Id: I6f90c02779a1e8aead690428626e3b9f06aa04df
Phil Weaver [Wed, 11 Jan 2017 16:42:26 +0000 (16:42 +0000)]
Merge "Accessibility support for ClickableSpan"
Mark Salyzyn [Wed, 11 Jan 2017 16:30:03 +0000 (08:30 -0800)]
resolve merge conflicts of
082a1721b516 to master
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
Jason Monk [Wed, 4 Jan 2017 20:13:11 +0000 (15:13 -0500)]
Add one-shot plugin support
Should have happened a while ago.
Test: runtest systemui
Change-Id: I0da4deb5c297e8030213810815a408364ec97e14
Neil Fuller [Wed, 11 Jan 2017 16:15:13 +0000 (16:15 +0000)]
resolve merge conflicts of
46c39f6c3640 to master
Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052
Akira Oshimi [Wed, 11 Jan 2017 16:11:53 +0000 (16:11 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am:
e3677865a8 am:
49b68ad0cd
am:
d999e53487
Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce
Hridya Valsaraju [Wed, 11 Jan 2017 16:07:40 +0000 (08:07 -0800)]
Use bitfields in GNSS HAL
Test: mm
Bug:
31974439
Change-Id: Ic14715d7bc55a3460756b07190bf02d6cebe3c52
Akira Oshimi [Wed, 11 Jan 2017 16:06:22 +0000 (16:06 +0000)]
Merge "Fix clipping for edit screen of Quick Settings" am:
e3677865a8
am:
49b68ad0cd
Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d
TreeHugger Robot [Wed, 11 Jan 2017 16:02:51 +0000 (16:02 +0000)]
Merge "Fixes for FlashlightTile lifecycle"
Akira Oshimi [Wed, 11 Jan 2017 16:01:23 +0000 (16:01 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
am:
e3677865a8
Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9
Diego Perez [Thu, 17 Nov 2016 16:04:39 +0000 (16:04 +0000)]
Separate render and verify in tests
Test: Test refactoring. Tests still pass
Change-Id: Icdee3eb9ef1b2639418110583ac74a3fd5362166
(cherry picked from commit
564b00dd5201711c25a3580aa21be8b36bfaf923)
Diego Perez [Wed, 11 Jan 2017 15:57:12 +0000 (15:57 +0000)]
Merge "Call onApplyWindowInsets after requestApplyWindowInsets"
Treehugger Robot [Wed, 11 Jan 2017 15:51:36 +0000 (15:51 +0000)]
Merge "Fix clipping for edit screen of Quick Settings"
Lenka Trochtova [Wed, 11 Jan 2017 15:48:30 +0000 (15:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
0c1a4b6a97 am:
345362c66f am:
44a53bab46
am:
aa369e5d19
Change-Id: Iac1ae24754e012d31341f3a2b6fec3c637180f8e
Mark Salyzyn [Wed, 11 Jan 2017 15:45:46 +0000 (15:45 +0000)]
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am:
e7fcbcb991 am:
6143cbf1e5
am:
ef8ccc8510
Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
Neil Fuller [Wed, 11 Jan 2017 15:45:29 +0000 (15:45 +0000)]
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am:
649a89e524 am:
f4e236c794 am:
43d53395dc
am:
75f84f2261
Change-Id: I5cf584048e1e2cde67c33d77e99cd181db4e8c82
Richard Uhler [Wed, 11 Jan 2017 15:41:36 +0000 (15:41 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am:
8582826f8d am:
5c5637e1bd am:
4911e517ab
am:
c662c1541b
Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632
Erik Kline [Wed, 11 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "Prepare UpstreamNetworkMonitor for extraction" am:
f84e5e8f76 am:
d48902d37e am:
305796276b
am:
1559d51f86
Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a