OSDN Git Service
Sudheer Shanka [Thu, 18 May 2017 18:06:56 +0000 (18:06 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev am:
aff7c3c71e
am:
1768a0054d
Change-Id: Ic22cc9e7289479e8e7df8db961b240db93721a15
Dianne Hackborn [Thu, 18 May 2017 18:04:17 +0000 (18:04 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
e4f484915f
am:
4d208f2ec6
Change-Id: Idc57b2a5953b0525d7c51999bcefdba868c68e16
Todd Kennedy [Thu, 18 May 2017 17:58:29 +0000 (17:58 +0000)]
Merge "Add action to launch intent" into oc-dev am:
ed57e46089
am:
61bfa28b97
Change-Id: I5ca06a8da6aa5ded02670736dacdb1e4c39a6169
Adam Lesinski [Thu, 18 May 2017 17:56:15 +0000 (17:56 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev am:
2d885e942d
am:
0196460f27
Change-Id: I8bff9b440b5a1f75d75e3601b654aa8825cf9523
Sudheer Shanka [Thu, 18 May 2017 17:53:28 +0000 (17:53 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
am:
aff7c3c71e
Change-Id: Ie7691a19ef61668afd9200c9a3c77fa9fc5368f1
Dianne Hackborn [Thu, 18 May 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
e4f484915f
Change-Id: I644cf3173134c0aeb2cddcb8add85803aa76b362
Todd Kennedy [Thu, 18 May 2017 17:48:09 +0000 (17:48 +0000)]
Merge "Add action to launch intent" into oc-dev
am:
ed57e46089
Change-Id: Ib34609428416c6356fa1c5af08411dfc389372a0
Adam Lesinski [Thu, 18 May 2017 17:42:44 +0000 (17:42 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
am:
2d885e942d
Change-Id: Ic1c24dd55a4d6258533e57cea957a775e03013df
Sudheer Shanka [Thu, 18 May 2017 17:42:10 +0000 (17:42 +0000)]
Merge "More unit tests for classes needed in reading uid times per cpu freq." into oc-dev
Winson Chung [Thu, 18 May 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev am:
13bd634262
am:
8d7692c8cf
Change-Id: I7dc950c411efbd8e6c7fd6f2d3031ebd80d8ac72
Dianne Hackborn [Thu, 18 May 2017 17:35:08 +0000 (17:35 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:31:04 +0000 (17:31 +0000)]
Merge "Add action to launch intent" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:30:21 +0000 (17:30 +0000)]
Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev
Winson Chung [Thu, 18 May 2017 17:27:59 +0000 (17:27 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
am:
13bd634262
Change-Id: I37ba0818f8bac5b88f2887825a0595f0550316bf
Winson Chung [Thu, 18 May 2017 17:18:52 +0000 (17:18 +0000)]
Merge "Fix issue with deferred start of the background loader." into oc-dev
Antony Sargent [Thu, 18 May 2017 16:54:17 +0000 (16:54 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev am:
8d87842690
am:
81877dbb79
Change-Id: Ia5bf4beb7325e63d718073edfcea5360965ac8c3
Antony Sargent [Thu, 18 May 2017 16:46:08 +0000 (16:46 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
am:
8d87842690
Change-Id: Idbb41ac149976073add1f03e9aa3d888d36c999d
Antony Sargent [Thu, 18 May 2017 16:37:28 +0000 (16:37 +0000)]
Merge "Fix a race condition in the A2dpProfile constructor" into oc-dev
Andy Hung [Thu, 18 May 2017 16:34:39 +0000 (16:34 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am:
b33c0eb07a
am:
0cc01b5bc2
Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31
Andy Hung [Thu, 18 May 2017 16:26:41 +0000 (16:26 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am:
b33c0eb07a
Change-Id: Icc37873492d612a66484d731168de5c5e27213c9
Jeff Sharkey [Thu, 18 May 2017 16:23:23 +0000 (16:23 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev am:
91f674eeda
am:
e261ea2195
Change-Id: I184f06046d89a182f505508351bf64f29072467a
Andy Hung [Thu, 18 May 2017 16:15:44 +0000 (16:15 +0000)]
Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
Jeff Sharkey [Thu, 18 May 2017 16:13:42 +0000 (16:13 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
91f674eeda
Change-Id: If6537f3a9f00e5379b2de5db1d8b9712bc20798d
Jeff Sharkey [Thu, 18 May 2017 16:11:07 +0000 (16:11 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev am:
997042ac33
am:
c244963675
Change-Id: I30e0155a9260ec4099ad45d7161c8459c8b657a2
Christine Franks [Thu, 18 May 2017 16:04:30 +0000 (16:04 +0000)]
Merge "Don't back up night display state settings"
Jeff Sharkey [Thu, 18 May 2017 16:02:49 +0000 (16:02 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
am:
997042ac33
Change-Id: I6da01817370fa1244499644497396a57e55df492
Jeff Sharkey [Thu, 18 May 2017 15:59:34 +0000 (15:59 +0000)]
Merge "Unbreak APK 26 apps running on "O" preview/beta builds." into oc-dev
TreeHugger Robot [Thu, 18 May 2017 15:52:37 +0000 (15:52 +0000)]
Merge "Unbreak even more APK 26 apps running on "O" preview/beta builds." into oc-dev
Jorim Jaggi [Thu, 18 May 2017 15:07:36 +0000 (15:07 +0000)]
Merge "Enable starting window logging" into oc-dev am:
5616c5f610
am:
682cd21187
Change-Id: I36e3fbd30d52446a7c3f281da28041ba0fa6e7d1
Jorim Jaggi [Thu, 18 May 2017 14:59:53 +0000 (14:59 +0000)]
Merge "Enable starting window logging" into oc-dev
am:
5616c5f610
Change-Id: I474a4db75828a2c8063c2761f046df3af07c92b9
Jorim Jaggi [Thu, 18 May 2017 14:51:44 +0000 (14:51 +0000)]
Merge "Enable starting window logging" into oc-dev
Jorim Jaggi [Thu, 18 May 2017 12:58:33 +0000 (12:58 +0000)]
Merge "Fix refactoring typo" into oc-dev am:
4566518ff2
am:
13f214916c
Change-Id: I2101b07da283ed93e4286947d5d3115646c509eb
Jorim Jaggi [Thu, 18 May 2017 12:52:52 +0000 (12:52 +0000)]
Merge "Fix refactoring typo" into oc-dev
am:
4566518ff2
Change-Id: Iee60a8e32c907832cdb54a545f6a07518804f6bd
Jorim Jaggi [Wed, 17 May 2017 13:10:29 +0000 (15:10 +0200)]
Enable starting window logging
Also extend it to make sure we catch the bug!
Test: Open a couple of cold/hot apps, make sure logs look accurate
Bug:
37888853
Change-Id: Ied394969748d4d2d40359af15e0b491a2dc2b078
Jorim Jaggi [Thu, 18 May 2017 12:41:18 +0000 (12:41 +0000)]
Merge "Fix refactoring typo" into oc-dev
Przemyslaw Szczepaniak [Thu, 18 May 2017 12:22:33 +0000 (12:22 +0000)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
am:
3a9f256329 -s ours
Change-Id: If5f8e616ae84df0b850aa29d2db06961e91acc1a
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:57:09 +0000 (10:57 +0100)]
resolve merge conflicts of
2ce1b38e85af to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia1eb0590edf2b074f6cbf16060cda2257091edd8
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:15:30 +0000 (09:15 +0000)]
Merge "Consolidated all data allow/disallow logic into one method" am:
449d73251f
am:
ab0f6fc5d2
Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:07:24 +0000 (09:07 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
am:
449d73251f
Change-Id: I861d75dad60ab83039aa06565141a2eb5b294386
Przemyslaw Szczepaniak [Thu, 18 May 2017 08:58:26 +0000 (08:58 +0000)]
Merge "Consolidated all data allow/disallow logic into one method"
TreeHugger Robot [Thu, 18 May 2017 08:43:19 +0000 (08:43 +0000)]
Merge "Add metrics constant for Choose Lock Dialog"
TreeHugger Robot [Thu, 18 May 2017 06:38:01 +0000 (06:38 +0000)]
Merge "Avoid a race condition on reading qemu.gles property"
TreeHugger Robot [Thu, 18 May 2017 06:30:26 +0000 (06:30 +0000)]
Merge "Added indication text stubs for changes to trust being managed."
TreeHugger Robot [Thu, 18 May 2017 06:24:26 +0000 (06:24 +0000)]
Merge "Removed unused attribute"
Hugo Benichi [Thu, 18 May 2017 06:02:13 +0000 (06:02 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev am:
1fe60b213e -s ours
am:
5bda8323c5 -s ours
Change-Id: If6a502bc0f9b63a0bf7431a5a08f1f476a1640b7
TreeHugger Robot [Thu, 18 May 2017 05:53:12 +0000 (05:53 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests"
Hugo Benichi [Thu, 18 May 2017 05:53:07 +0000 (05:53 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev
am:
1fe60b213e -s ours
Change-Id: Ic5974733afcae83e8233949f098958eb2bd35f1e
TreeHugger Robot [Thu, 18 May 2017 05:40:34 +0000 (05:40 +0000)]
Merge "Change currentTimeMillis to elapsedRealtime"
Hugo Benichi [Thu, 18 May 2017 05:39:24 +0000 (05:39 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 04:33:40 +0000 (04:33 +0000)]
Merge "PowerManager: Log wake up reason"
Jack Yu [Tue, 2 May 2017 00:01:11 +0000 (17:01 -0700)]
Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.
Test: Telephony sanity tests and unit tests
bug:
33847610
Merged-In: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Change-Id: I24f1415bbb59990e9e8e9920724be9e3f17e3e60
Android Build Merger (Role) [Thu, 18 May 2017 04:06:46 +0000 (04:06 +0000)]
Merge "Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66 am:
945ff184c2 am:
308ed7f467"
Tomasz Wasilczyk [Thu, 18 May 2017 04:06:21 +0000 (04:06 +0000)]
Merge "Implement isAntennaConnected interface of ITuner."
Erik Kline [Thu, 18 May 2017 04:04:57 +0000 (04:04 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66 am:
945ff184c2
am:
308ed7f467
Change-Id: I2644f518304a03da469fb9c2aa01a6d8f1a97901
Erik Kline [Thu, 18 May 2017 03:54:30 +0000 (03:54 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66
am:
945ff184c2
Change-Id: Ia9d15f0dcc49ce070f8684eb8c8481310859faa5
Daichi Hirono [Thu, 18 May 2017 03:54:25 +0000 (12:54 +0900)]
Fix NPE in MtpDocumentsProviderTests
Previous patch ag/
2250238 broke MtpDocumentsProviderTests since
ServiceIntentSender's constructor refers the context argument which is
null in the tests.
The CL adds a test version of the constructor which does not use the
context argument in it.
Bug:
38363487
Test: MtpDocumentsProviderTests
Change-Id: I68a1d8cb6997499e5069c33f70fd0f675aaad77c
Hugo Benichi [Thu, 18 May 2017 03:50:46 +0000 (03:50 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee am:
13f0d10115 am:
31c566037b
am:
a67ea35d9a
Change-Id: I000077352ab0e1af7209a266be0309607034dbea
Erik Kline [Thu, 18 May 2017 03:47:16 +0000 (03:47 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07
am:
96f9371a66
Change-Id: I58f88c3f5505b83539654c75e05de4eb29b64f15
Hugo Benichi [Thu, 18 May 2017 03:44:20 +0000 (03:44 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee am:
13f0d10115
am:
31c566037b
Change-Id: Ib880777290f74eaa565839632eb7518642fcc4f3
Erik Kline [Thu, 18 May 2017 03:38:43 +0000 (03:38 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
am:
0373340b07
Change-Id: I1381b8457781dcfafe52371a5dc7628282cb8efc
Hugo Benichi [Thu, 18 May 2017 03:36:50 +0000 (03:36 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee
am:
13f0d10115
Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
TreeHugger Robot [Thu, 18 May 2017 03:34:26 +0000 (03:34 +0000)]
Merge "Print A11yEv. Content Change Types in DEBUG toString"
Yipeng Cao [Thu, 18 May 2017 03:31:39 +0000 (20:31 -0700)]
Change currentTimeMillis to elapsedRealtime
System.currentTimeMillis does not gauntness to be monotonically
increasing, changed to SystemClock.elapsedRealtime
Bug:
38317243
Fixes:
38317243
Test: make -j 32; flash the angler device using local build
Change-Id: I75a70d43028e901d9f3459d6b525cac58e8e64af
Hugo Benichi [Thu, 18 May 2017 03:29:50 +0000 (03:29 +0000)]
Merge "Fix NetworkNotificationManagerTest"
am:
c13a80deee
Change-Id: I8f02be13da5790d0fd60f04886e87de04c96de08
Treehugger Robot [Thu, 18 May 2017 03:25:28 +0000 (03:25 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
Hugo Benichi [Thu, 18 May 2017 03:22:53 +0000 (03:22 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110 am:
80eb47ff61
am:
cf9ab571cd
Change-Id: I4c0d711b34c4bcd69a1811a97fe74053bdc2945a
Hugo Benichi [Thu, 18 May 2017 03:20:50 +0000 (03:20 +0000)]
Merge "Fix NetworkNotificationManagerTest"
Hugo Benichi [Thu, 18 May 2017 03:15:50 +0000 (03:15 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110
am:
80eb47ff61
Change-Id: I5a8e353d33ed70d6f0627dc8f9cc4d8cda8a6f8b
Hugo Benichi [Thu, 18 May 2017 03:08:46 +0000 (03:08 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337
am:
3bda223110
Change-Id: Ib154e58cab427aa60740246f3eef930a09261733
Hugo Benichi [Thu, 18 May 2017 02:58:21 +0000 (02:58 +0000)]
Merge "Captive portals: reinspect http result after fallback probe"
am:
3a7c4f3337
Change-Id: Ia9dfbb764909aeb8586066121ddc8106fa14bb7e
Hugo Benichi [Wed, 17 May 2017 01:30:40 +0000 (10:30 +0900)]
Captive portals: reinspect http result after fallback probe
When DNS queries that precede the http and https probe take a long time
to complete, it is possible that the fallback probe fires earlier than
either the http and https probes.
This causes the detection logic to ignore the result of the http probe,
which may cause the system to miss captive portals advertising
themselves on the url used by the http probe but not on the url used by
the fallback probe.
This patch fixes that issue by forcing the detection to wait on the
result of the http probe if the fallback probe does not find a portal.
Bug:
38259299
Bug:
36532213
Test: manually tested with nearby captive portal networks
Merged-In: I07ea23a2b5f694c5ada9633169af98409efedff1
Change-Id: Ie016cad52719d07167acf026f738d31000c78cd2
(cherry picked from commit
fc47442b31761e64e188c51c3dd2a782ecbd9c62)
Hugo Benichi [Thu, 18 May 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Captive portals: reinspect http result after fallback probe"
Hugo Benichi [Thu, 18 May 2017 02:47:54 +0000 (02:47 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c am:
9fdc903af7 am:
777bf77c2c -s ours
am:
fe95db3d1b
Change-Id: Ibba873042627166120f4040896c58e96bff2b085
Hugo Benichi [Thu, 18 May 2017 02:40:26 +0000 (02:40 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c am:
9fdc903af7
am:
777bf77c2c -s ours
Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6
Hugo Benichi [Thu, 18 May 2017 02:30:44 +0000 (02:30 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c
am:
9fdc903af7
Change-Id: I06cec2595d67d029e08e4d556130c5956bfb387e
Hugo Benichi [Thu, 18 May 2017 02:23:12 +0000 (02:23 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net"
am:
c01fbf0f0c
Change-Id: I10ce85211ac0305e8d05ca02b58b819297f59bbf
Jorim Jaggi [Thu, 18 May 2017 02:19:43 +0000 (02:19 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev am:
b114e4ff82
am:
8792859b60 -s ours
Change-Id: Ib7fbe0457a2637348d695ea3702060a3aee910b4
Zachary Iqbal [Thu, 18 May 2017 01:52:49 +0000 (18:52 -0700)]
Added indication text stubs for changes to trust being managed.
Notes:
- Subclasses of KeyguardIndicationController can now provide indication text
to be displayed when a trust agent is managed.
Test: runtest sysui
Bug:
38397982
Change-Id: I1b7ee3041aceae94d12da25608f8e7b2e9ebbbe2
Hugo Benichi [Thu, 23 Mar 2017 03:32:27 +0000 (12:32 +0900)]
Fix NetworkNotificationManagerTest
The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.
This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.
Bug:
32561414
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Merged-In: I4837b1175d7c9133e9156e33acaa1e7e3341cc62
Change-Id: Ia30587bd68a87b83b62f57eeeb28fef7d95dbf81
(cherry picked from commit
f8b804be5aeb5d0a36ff88649d7c5ecdc47c3ad1)
Jorim Jaggi [Thu, 18 May 2017 02:03:40 +0000 (02:03 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev
am:
b114e4ff82
Change-Id: Ibf9b7f59c6b5d86116dc4405f6ac22f527eb8f8a
Hugo Benichi [Thu, 18 May 2017 02:01:39 +0000 (02:01 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net"
Rebecca Silberstein [Thu, 18 May 2017 02:00:06 +0000 (02:00 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev am:
f17d3b89d3
am:
b4f1f290c9
Change-Id: Iaa1474bd24d63e957ae82745b66c7571a5f18433
TreeHugger Robot [Thu, 18 May 2017 01:55:42 +0000 (01:55 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev
Andrii Kulian [Thu, 18 May 2017 01:53:46 +0000 (01:53 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev am:
5a270bcd66
am:
d6d0dcd4ce
Change-Id: I38e77e306ffc673b7285fdd8b1b94cafcea9fd6d
Rebecca Silberstein [Thu, 18 May 2017 01:50:40 +0000 (01:50 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev
am:
f17d3b89d3
Change-Id: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
Andrii Kulian [Thu, 18 May 2017 01:45:05 +0000 (01:45 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev
am:
5a270bcd66
Change-Id: Ia6ab4420855c9d1e33b7fc29985fceff7cd154fd
TreeHugger Robot [Thu, 18 May 2017 01:44:30 +0000 (01:44 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev
Andrii Kulian [Thu, 18 May 2017 01:36:12 +0000 (01:36 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev
Andy Hung [Mon, 15 May 2017 22:41:14 +0000 (15:41 -0700)]
VolumeShaper: Enable xOffset from Java
Previously only accessible from native.
Also improve documentation and comments.
Test: CTS VolumeShaperTest, Ducking
Bug:
38353147
Change-Id: I27bb34f0a5d28f80d138111bbeeb92653b5195c5
Ram Periathiruvadi [Thu, 18 May 2017 01:01:34 +0000 (01:01 +0000)]
Fix for Bluetooth not restarting on User Switch am:
88256d1a8a
am:
f251e9bf0e
Change-Id: Ic634e943c6752a98ac170f4becc23f379e16bdea
Hugo Benichi [Thu, 18 May 2017 00:57:00 +0000 (00:57 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960 am:
cd821b231a am:
544bcbe78e
am:
c3367ebcf7
Change-Id: I663f5ae4f1e15bd39e8ed927ac71958818452967
Ram Periathiruvadi [Thu, 18 May 2017 00:52:56 +0000 (00:52 +0000)]
Fix for Bluetooth not restarting on User Switch
am:
88256d1a8a
Change-Id: I70f1ee3d651022a0a7c292c783120ee7e4e4591d
Hugo Benichi [Thu, 18 May 2017 00:48:14 +0000 (00:48 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960 am:
cd821b231a
am:
544bcbe78e
Change-Id: I5d9a01a5804a7cc6289253db09078ede00fc0dc5
Erik Kline [Fri, 12 May 2017 07:52:48 +0000 (16:52 +0900)]
Expand logging capabilities of Tethering subsystem
Introduce a SharedLog that can be shared among all Tethering
components. All log entries go to the same log, and each includes
its subsystem name. Additionally, all entries emitted to the
system log shared the same tag, so can easily be watched.
More subsystems can inherit a SharedLog, but to minimize cherry-pick
conflicts we limit ourselves to these changes only.
Test: as follows
- built
- flashed
- booted
- log output observed via dumpsys
- runtest frameworks-net passes
Bug:
32163131
Bug:
36988090
Bug:
38218697
Change-Id: I1229d4c55987402d84b0d4a2c8a595e0c829aa3e
Hugo Benichi [Thu, 18 May 2017 00:37:40 +0000 (00:37 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960
am:
cd821b231a
Change-Id: Ic9f06631a7f937a0f3730b167e5db7d8c0dcf775
Ram Periathiruvadi [Thu, 4 May 2017 02:11:20 +0000 (19:11 -0700)]
Fix for Bluetooth not restarting on User Switch
The flag that keeps track of the Bluetooth adapter status(mEnable) is
not guarded correctly and could go out of sync with the adapter status.
This causes User Switch handling to not function correctly since it
checks for the status of the mEnable flag before restarting Bluetooth.
This fix queries the Bluetooth Adapter for the status instead of using
the mEnable flag.
Bug: b/
37648701
Test: Tested switching users multiple times in both phone and carkit.
Also tested pairing and connection for sanity.
Change-Id: I17facecf8e1de90df11c11d5b0a184f48a0356e4
(cherry picked from commit
7d1203a2f4fdbafe26d33421c3cdd83f07a5fba8)
Hugo Benichi [Thu, 18 May 2017 00:27:06 +0000 (00:27 +0000)]
Merge "Finish moving NetworkStats tests to tests/net"
am:
1ae1b6b960
Change-Id: If85e483d5b44872c10e42ef55ddaf209601c7cfa
Jorim Jaggi [Thu, 18 May 2017 00:24:33 +0000 (00:24 +0000)]
Merge "Fix GraphicBuffer leaks in system_server" into oc-dev am:
a40bb1ed4a
am:
ec182d7d1b
Change-Id: I8bb3949bdd5be5fc4357998de4d8073594eed3ac
Wale Ogunwale [Thu, 18 May 2017 00:18:34 +0000 (00:18 +0000)]
Merge "Reset hidden state of AppToken that was cleared due to starting window" into oc-dev am:
a36e3a1320
am:
eed78264ed
Change-Id: I15f93756b44d94baeb71fa2ce73f337a92c3d213
Jorim Jaggi [Thu, 18 May 2017 00:13:52 +0000 (00:13 +0000)]
Merge "Fix GraphicBuffer leaks in system_server" into oc-dev
am:
a40bb1ed4a
Change-Id: Iefb739b06406216a943c9f3ac31fed48cd3eb53b
OSDN Git Service
