OSDN Git Service
Jack He [Mon, 10 Apr 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd am:
d86c1fca76 am:
25c086b7e2
am:
b111c6f753
Change-Id: Iee048785ebe566fcb8e80c5e97bb61a78b4afde2
Jack He [Mon, 10 Apr 2017 23:20:08 +0000 (23:20 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd am:
d86c1fca76
am:
25c086b7e2
Change-Id: I7bf3b83c55a2b1dfaf23af65780529cc5a5fa8d4
Jack He [Mon, 10 Apr 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd
am:
d86c1fca76
Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
Jack He [Mon, 10 Apr 2017 22:59:56 +0000 (22:59 +0000)]
Merge "Add developer setting and system API for inband ringing support"
am:
1da38b2bcd
Change-Id: I24f6eccb3a3dcc37fd21ee48d8844bd5a1b112f0
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer setting and system API for inband ringing support"
Tyler Gunn [Mon, 10 Apr 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91 am:
1fb1c39838 am:
b428268052
am:
1c80ac52fe -s ours
Change-Id: I7a8b098fd65ba6c0aaf37ed51e662e3066bdba5f
Tyler Gunn [Mon, 10 Apr 2017 22:18:01 +0000 (22:18 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91 am:
1fb1c39838
am:
b428268052
Change-Id: Ib0eae364d2fff21e80d04e740c34421d42c85c57
Tyler Gunn [Mon, 10 Apr 2017 22:08:12 +0000 (22:08 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91
am:
1fb1c39838
Change-Id: I1c4cdcbe0c25acb899d387f70d128a267385474b
Tyler Gunn [Mon, 10 Apr 2017 21:58:08 +0000 (21:58 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
am:
c4ea961f91
Change-Id: I77e7353fe345fbf17f9499aea9e792a23e8725d4
Treehugger Robot [Mon, 10 Apr 2017 21:49:05 +0000 (21:49 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Todd Kennedy [Mon, 10 Apr 2017 20:56:36 +0000 (20:56 +0000)]
Merge "send broadcast to the right users" into oc-dev am:
4a30689414
am:
41d82e619f
Change-Id: I25cf7f76c50ddb9770a060a1be5dac878fb3b16d
Wale Ogunwale [Mon, 10 Apr 2017 20:48:11 +0000 (20:48 +0000)]
Merge "Do not set outActivity if value is null." into oc-dev am:
a09111e745
am:
aba6084239
Change-Id: I9bcc7cbb15dd5f2ed27d99ce283fa920fc766084
Todd Kennedy [Mon, 10 Apr 2017 20:33:48 +0000 (20:33 +0000)]
Merge "send broadcast to the right users" into oc-dev
am:
4a30689414
Change-Id: I25077adff02d451493f487432a174aa3fbbff2d8
Wale Ogunwale [Mon, 10 Apr 2017 20:32:17 +0000 (20:32 +0000)]
Merge "Do not set outActivity if value is null." into oc-dev
am:
a09111e745
Change-Id: I5bae5f17d2b50f845f1b147458b3351bbf99b615
Tyler Gunn [Fri, 7 Apr 2017 21:57:37 +0000 (14:57 -0700)]
Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug:
34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
Todd Kennedy [Mon, 10 Apr 2017 20:10:11 +0000 (20:10 +0000)]
Merge "send broadcast to the right users" into oc-dev
Wale Ogunwale [Mon, 10 Apr 2017 20:04:06 +0000 (20:04 +0000)]
Merge "Do not set outActivity if value is null." into oc-dev
Tyler Gunn [Mon, 10 Apr 2017 20:03:44 +0000 (20:03 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Jack He [Fri, 18 Nov 2016 00:19:43 +0000 (16:19 -0800)]
Add developer setting and system API for inband ringing support
* Add 1 system API to check inband ringing flag in config.xml
static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature
Bug:
19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
Sudheer Shanka [Mon, 10 Apr 2017 19:49:24 +0000 (19:49 +0000)]
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev am:
73edcd7328
am:
1bbe822a5c
Change-Id: I36464a2ce5370579b1b051f2eaa0a5c23de51fc7
Andrii Kulian [Mon, 10 Apr 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Fix activity move between displays" into oc-dev am:
c2ec7bf965
am:
f44551b505
Change-Id: I8d92ec6381c4063c6f1af6fb229e5bda09ad9380
Jerry Zhang [Mon, 10 Apr 2017 19:37:58 +0000 (19:37 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev am:
0015a15353
am:
f3c310e853
Change-Id: I8d145d23dd17cc07f0f9d89af718dafa1c3a3191
Sudheer Shanka [Mon, 10 Apr 2017 19:37:21 +0000 (19:37 +0000)]
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
am:
73edcd7328
Change-Id: I8428663ed86cc4257b24ad10488d69b89666537d
Dmitry Dementyev [Mon, 10 Apr 2017 19:36:35 +0000 (19:36 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev am:
d401163599
am:
a7dd87ce2d
Change-Id: Id21bbe82a932cf6b7a49ad342aee7cee6db2685d
Andrii Kulian [Mon, 10 Apr 2017 19:35:28 +0000 (19:35 +0000)]
Merge "Fix activity move between displays" into oc-dev
am:
c2ec7bf965
Change-Id: I7831bea7832d4a0ddd1f841c9ce2cce5bda403c7
Sudheer Shanka [Mon, 10 Apr 2017 19:28:25 +0000 (19:28 +0000)]
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
Jerry Zhang [Mon, 10 Apr 2017 19:26:47 +0000 (19:26 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
am:
0015a15353
Change-Id: I426a6ab01081887fa79193e6ee48288f79b2c74b
Andrii Kulian [Mon, 10 Apr 2017 19:20:31 +0000 (19:20 +0000)]
Merge "Fix activity move between displays" into oc-dev
Dmitry Dementyev [Mon, 10 Apr 2017 19:14:52 +0000 (19:14 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
am:
d401163599
Change-Id: Ia6c1d5008ed4884f7214d589f1d2b4e02413cf8e
Todd Kennedy [Mon, 10 Apr 2017 19:12:11 +0000 (12:12 -0700)]
send broadcast to the right users
Change-Id: Ibda2d922cd58d6ca1c1a4ecdccaa25e5c71c6320
Fixes:
37192695
Test: manual; create restricted profile and see that users haven't been removed
Jerry Zhang [Mon, 10 Apr 2017 18:51:53 +0000 (18:51 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
Jerome Gaillard [Mon, 10 Apr 2017 18:43:06 +0000 (18:43 +0000)]
Merge "Update Bitmap_Delegate following Change I0092fe44"
Dmitry Dementyev [Mon, 10 Apr 2017 18:30:47 +0000 (18:30 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
Jeff Davidson [Mon, 10 Apr 2017 18:15:15 +0000 (18:15 +0000)]
Merge "API plumbing to support carrier app downloading."
Bryce Lee [Mon, 10 Apr 2017 18:06:17 +0000 (11:06 -0700)]
Do not set outActivity if value is null.
Recent changes passed down the nullable array to a method where it
was not being properly checked.
Change-Id: Ibf940f9225e4c9901869188aa55a04d0908015c3
Fixes:
37197666
Test: manual via bug repro steps.
Android Build Merger (Role) [Mon, 10 Apr 2017 16:56:56 +0000 (16:56 +0000)]
Merge "Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am:
c922c4827a am:
e7534f48ce"
Selim Gurun [Mon, 10 Apr 2017 16:56:06 +0000 (16:56 +0000)]
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am:
c922c4827a
am:
e7534f48ce
Change-Id: I8c01b72d5f593070eebbac1f5271ca166e6abf7b
Diego Perez [Mon, 10 Apr 2017 16:55:36 +0000 (16:55 +0000)]
Merge "Inline some of the files into the tests"
Daniel Nishi [Mon, 10 Apr 2017 16:50:12 +0000 (16:50 +0000)]
Merge "Move the movies metrics constant back into O."
Selim Gurun [Mon, 10 Apr 2017 16:48:28 +0000 (16:48 +0000)]
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
am:
c922c4827a
Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
TreeHugger Robot [Mon, 10 Apr 2017 16:36:41 +0000 (16:36 +0000)]
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
Jerome Gaillard [Mon, 10 Apr 2017 16:07:49 +0000 (17:07 +0100)]
Update Bitmap_Delegate following Change I0092fe44
Test: Layoutlib tests
Change-Id: I3b1cfb460a6b7ccd6b63bd53194383154a68591c
Tyler Gunn [Fri, 7 Apr 2017 21:57:37 +0000 (14:57 -0700)]
Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug:
34159263
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
Eugene Susla [Mon, 10 Apr 2017 15:23:02 +0000 (15:23 +0000)]
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev am:
0ac8fd7adb
am:
d2d45e9de8
Change-Id: I259218d16a0c368c7374d2ac5d2e7dfc3d2d14e2
Eugene Susla [Mon, 10 Apr 2017 15:18:14 +0000 (15:18 +0000)]
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
am:
0ac8fd7adb
Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9
Erik Kline [Mon, 10 Apr 2017 15:17:54 +0000 (15:17 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev am:
e9ec87d0d4
am:
09d6e39613
Change-Id: I237227497014cfd486f5ab4d2a9e9e524fe967c2
Erik Kline [Mon, 10 Apr 2017 15:09:14 +0000 (15:09 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
am:
e9ec87d0d4
Change-Id: I97ee81da94ac39199bb1e0ef2f6964b5a27d6358
TreeHugger Robot [Mon, 10 Apr 2017 15:06:05 +0000 (15:06 +0000)]
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
Diego Perez [Mon, 10 Apr 2017 14:07:38 +0000 (15:07 +0100)]
Inline some of the files into the tests
Modify LayoutPullParser construction to make clear what the different
constructors do and create a new one to build a parser just from a
String. By using this constructor, the CL inlines some of the smaller
files into the test for easier reading and maintenance.
Test: Modifies existing tests
Change-Id: Ieb20dcad4f62dc09252d01841bff37cf2c3c4a10
Erik Kline [Mon, 10 Apr 2017 14:57:45 +0000 (14:57 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
Bryce Lee [Mon, 10 Apr 2017 14:38:07 +0000 (14:38 +0000)]
Merge "Update decor LayoutParams when window is already added." into oc-dev am:
9c80a16c45
am:
da9546bebb
Change-Id: I1b47992388556858126ed6cb5fb80ed6cd69cae4
Bryce Lee [Mon, 10 Apr 2017 14:30:08 +0000 (14:30 +0000)]
Merge "Update decor LayoutParams when window is already added." into oc-dev
am:
9c80a16c45
Change-Id: I176bf43e9a200fc31641abe2fe45f2e0a284005f
Bryce Lee [Mon, 10 Apr 2017 14:22:44 +0000 (14:22 +0000)]
Merge "Update decor LayoutParams when window is already added." into oc-dev
Andrei Stingaceanu [Mon, 10 Apr 2017 13:06:49 +0000 (13:06 +0000)]
Merge "AutoSize TextView - fix measurements" into oc-dev am:
e812e7dc2e
am:
de8aec39bf
Change-Id: I582265f2e0c19118a3759e4348fd693df26ac905
Andrei Stingaceanu [Mon, 10 Apr 2017 13:02:40 +0000 (13:02 +0000)]
Merge "AutoSize TextView - fix measurements" into oc-dev
am:
e812e7dc2e
Change-Id: Ia8412a36bfb78752ead1a56b5391d30d9691ed22
Charles He [Mon, 10 Apr 2017 13:02:15 +0000 (13:02 +0000)]
Merge "VPN: cancel always-on notification with new id" into oc-dev am:
4286c5768d
am:
5744ea2c0d
Change-Id: Iffe87fb5e4bba4129e0d9109e73b11da01080e20
Charles He [Mon, 10 Apr 2017 12:53:29 +0000 (12:53 +0000)]
Merge "VPN: cancel always-on notification with new id" into oc-dev
am:
4286c5768d
Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c
Andrei Stingaceanu [Mon, 10 Apr 2017 12:48:28 +0000 (12:48 +0000)]
Merge "AutoSize TextView - fix measurements" into oc-dev
Charles He [Mon, 10 Apr 2017 12:43:32 +0000 (12:43 +0000)]
Merge "VPN: cancel always-on notification with new id" into oc-dev
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
Eric Sandness [Mon, 10 Apr 2017 12:32:44 +0000 (12:32 +0000)]
Merge "Fix mock of setApplicationRestrictions()" into oc-dev am:
c9a6e75682
am:
0a6fd9847c
Change-Id: Ic9cde2e7e7e8c6e338419006401a66cbeca7119b
Erik Kline [Mon, 10 Apr 2017 12:31:26 +0000 (12:31 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55 am:
908ce167eb am:
f6626e812c
am:
f700d5cad7
Change-Id: I9818021440930765c797b9720bdfe4230ca09b78
Eric Sandness [Mon, 10 Apr 2017 12:27:17 +0000 (12:27 +0000)]
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
am:
c9a6e75682
Change-Id: I6abbe1bf0073e236f1379a2dca208f5d3eab5e7f
Erik Kline [Mon, 10 Apr 2017 12:21:57 +0000 (12:21 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55 am:
908ce167eb
am:
f6626e812c
Change-Id: I79677f7e8e7ae5abec2a13b5e5391b8f07857a36
Eric Sandness [Mon, 10 Apr 2017 12:18:08 +0000 (12:18 +0000)]
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
Erik Kline [Mon, 10 Apr 2017 12:12:17 +0000 (12:12 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55
am:
908ce167eb
Change-Id: I6e72a9b90e59ea5abd1dfa11c6c3d16a5c98751c
Erik Kline [Mon, 10 Apr 2017 12:02:49 +0000 (12:02 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
am:
d3128d4b55
Change-Id: Ic7d5e3e23f9ccc0f094ba5991e2fdefa82865b01
Treehugger Robot [Mon, 10 Apr 2017 11:50:31 +0000 (11:50 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
Emilian Peev [Mon, 10 Apr 2017 10:23:39 +0000 (10:23 +0000)]
Merge "DngCreator: Populate baseline exposure tag" into oc-dev am:
b96891e0e3
am:
db1de8dd64
Change-Id: I9a58f9597d48abde9241b7eb9517eb8f2d5d5b0c
Emilian Peev [Mon, 10 Apr 2017 10:14:31 +0000 (10:14 +0000)]
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
am:
b96891e0e3
Change-Id: I37c556ff394769f6e38e8f19ca90667709ce8bf5
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
TreeHugger Robot [Mon, 10 Apr 2017 10:03:57 +0000 (10:03 +0000)]
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
Andrei Stingaceanu [Wed, 5 Apr 2017 15:51:00 +0000 (16:51 +0100)]
AutoSize TextView - fix measurements
The BoringLayout measurements for auto-size are
incorrect. Removed those and kept the StaticLayout
measurements.
Bug:
36940118
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t\
android.widget.cts.TextViewTest
Change-Id: I772ade08ed26efac05ca56cb7df8cfec0327633b
Lorenzo Colitti [Mon, 10 Apr 2017 07:24:36 +0000 (07:24 +0000)]
resolve merge conflicts of
edb6946bd119 to oc-dev-plus-aosp
am:
419aec6c3c
Change-Id: I7c6cc995a69320562d0bb9e22ad9782d0dad68d5
Lorenzo Colitti [Mon, 10 Apr 2017 07:02:55 +0000 (16:02 +0900)]
resolve merge conflicts of
edb6946bd119 to oc-dev-plus-aosp
Test: make -j64 framework services
Change-Id: Ia87be346703637ebcb88bcf39d7e8c3c71db44ab
Hugo Benichi [Mon, 10 Apr 2017 06:11:30 +0000 (06:11 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am:
b2adaad26b -s ours am:
f294973f6c -s ours am:
dde60ac16d -s ours
am:
0a782794d1
Change-Id: If1b31005aac6c1509e78db11d75fbfda00e6f3bc
Hugo Benichi [Mon, 10 Apr 2017 06:01:57 +0000 (06:01 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am:
b2adaad26b -s ours am:
f294973f6c -s ours
am:
dde60ac16d -s ours
Change-Id: Ib31248616d75fdb30f2230d8fed0ee577a71d116
Lorenzo Colitti [Mon, 10 Apr 2017 05:54:10 +0000 (05:54 +0000)]
Merge "Add an API hint for metered multipath traffic." am:
7a12f7efc7
am:
0ad718aab1
Change-Id: I787a9722c210632539a9258e8320f88153daba55
Hugo Benichi [Mon, 10 Apr 2017 05:52:51 +0000 (05:52 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests." am:
b2adaad26b -s ours
am:
f294973f6c -s ours
Change-Id: I1d6084255ee59ff55f8a91196852f3645c3fe281
Lorenzo Colitti [Mon, 10 Apr 2017 05:48:34 +0000 (05:48 +0000)]
Merge "Add an API hint for metered multipath traffic."
am:
7a12f7efc7
Change-Id: Ie0d289460f93d3b93d91545eb3dfa925f0bdee5f
Hugo Benichi [Mon, 10 Apr 2017 05:43:43 +0000 (05:43 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
am:
b2adaad26b -s ours
Change-Id: I47dbd0feaa99ff6018efc8703cfa29a265bc73fd
Treehugger Robot [Mon, 10 Apr 2017 05:40:08 +0000 (05:40 +0000)]
Merge "Add an API hint for metered multipath traffic."
Treehugger Robot [Mon, 10 Apr 2017 05:33:46 +0000 (05:33 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
Hugo Benichi [Mon, 10 Apr 2017 04:12:49 +0000 (13:12 +0900)]
DO NOT MERGE IP connectivity metrics: fix tests.
This patch fixes mismatch between current proto compiler and what is
expected in several IP connectivity metrics unit tests.
Test: built, flashed, $ runtest frameworks-net
Bug:
37126521
Change-Id: I1476c923d61f748ecac1146423127f54ba117502
Hugo Benichi [Mon, 10 Apr 2017 01:46:36 +0000 (01:46 +0000)]
Merge "Improve utility of IntArray and LongArray" am:
35786735df am:
e718797a37 am:
4ca1cb7c10
am:
6f75cb52e8
Change-Id: I82032bf85861cfc8aebffd9e49796fb61b5a19ed
Hugo Benichi [Mon, 10 Apr 2017 01:36:20 +0000 (01:36 +0000)]
Merge "Improve utility of IntArray and LongArray" am:
35786735df am:
e718797a37
am:
4ca1cb7c10
Change-Id: If206b2b4d837dbbb8d0fd0c9a75fad240bb5379e
Hugo Benichi [Mon, 10 Apr 2017 01:26:49 +0000 (01:26 +0000)]
Merge "Improve utility of IntArray and LongArray" am:
35786735df
am:
e718797a37
Change-Id: I21587b63e670e9a67ff23aeeda9c2ee9cc5a3a0a
Hugo Benichi [Mon, 10 Apr 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Improve utility of IntArray and LongArray"
am:
35786735df
Change-Id: Id50add8d7e3fc45978752a6a31760bc69df0cc4a
Hugo Benichi [Mon, 10 Apr 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Improve utility of IntArray and LongArray"
Hugo Benichi [Mon, 10 Apr 2017 00:41:10 +0000 (09:41 +0900)]
NetworkPolicyManagerService: fix deadlock
Callers of addNetworkPolicy() were not taking locks in the correct order
inside NetworkPolicyManagerService:
- addNetworkPolicy() is an internal method that calls
setNetworkPolicies which takes both mUidRulesFirstLock and
mNetworkPoliciesSecondLock in order.
- both callers of addNetworkPolicy, mWifiStateReceiver and
mConnReceiver via ensureActiveMobilePolicy, were taking
mNetworkPoliciesSecondLock before calling addNetworkPolicy.
- this causes the order of locking to be reversed, which can cause a
deadlock when another concurrent codepath in
NetworkPolicyManagerService tries to take both locks in the correct
order.
This patch fixes this issue by wrapping both problematic codepaths into
addNetworkPolicy() with a lock on mUidRulesFirstLock.
Test: build, flashed, NetworkPolicyManagerServiceTest passes
Bug:
36972283
Change-Id: If7888c11aef8b628e1b013224075c4c75eae0022
Bookatz [Sun, 9 Apr 2017 19:11:28 +0000 (19:11 +0000)]
Merge "Fix counting problems in StopwatchTimer." into oc-dev am:
eca0d421d1
am:
7b6128e54b
Change-Id: Ia62252b2198a00d1065fc5c1a28af20ed481ba79
Bookatz [Sun, 9 Apr 2017 19:02:13 +0000 (19:02 +0000)]
Merge "Fix counting problems in StopwatchTimer." into oc-dev
am:
eca0d421d1
Change-Id: I690fbd08ec678819200e8d7019f0972511a51fcc
TreeHugger Robot [Sun, 9 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Fix counting problems in StopwatchTimer." into oc-dev
Charles He [Sat, 8 Apr 2017 21:03:42 +0000 (22:03 +0100)]
VPN: cancel always-on notification with new id
Previously we used 0 for the id of the "Always-on VPN disconnected"
notification, as did many other system services. In a recent CL, an
effort was made to assign a dedicated id to each of these system
notifications. Unfortunately, this CL only changed the id in the call to
NotificationManager#notify(), but not NotificationManager#cancel(). This
causes the notification to persist even when always-on VPN is turned off
by the user.
This CL changes the id in the cancel() call, thus fixing the issue.
Bug:
37175930
Test: manually enable and disable always-on and observe the notification
Change-Id: I39c7325c78479afe3dc9e1764d54406bd721b067
Bill Yi [Sat, 8 Apr 2017 08:21:56 +0000 (08:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
73e510e6fa -s ours
am:
1ef794a3f6 -s ours
Change-Id: I88728103bc3cb22c7df3ae2056b55f7329ca150a
Bill Yi [Sat, 8 Apr 2017 08:20:57 +0000 (08:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
c2f554292e -s ours
am:
9e661d49bc -s ours
Change-Id: Ic394d68b3da185580e76cb3812cd9a57a05aa67c
Bill Yi [Sat, 8 Apr 2017 08:19:55 +0000 (08:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
ce1e6999a0 -s ours
am:
5fe7eeb58f -s ours
Change-Id: I03b5cb7fcef47a9cc6bac750ec035493cf868f1c
Bill Yi [Sat, 8 Apr 2017 08:13:28 +0000 (08:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
99c95f8dd8 -s ours
am:
3f36379bef -s ours
Change-Id: Icf966d19f0bc77ddd2f8abbe111345672d059908
Bill Yi [Sat, 8 Apr 2017 08:12:36 +0000 (08:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
53df9f871a -s ours
am:
058a4e1844 -s ours
Change-Id: Ia34b4120d4a8bb5bb6de042f55e38a924d8ce6c5
Bill Yi [Sat, 8 Apr 2017 08:11:43 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
df12f01abd -s ours
am:
146f901c9b -s ours
Change-Id: I8f49d02b3ae75bbf6a91ce8715041f4368813784
OSDN Git Service
