OSDN Git Service
Rebecca Silberstein [Wed, 26 Apr 2017 21:06:29 +0000 (21:06 +0000)]
Merge "WifiManager: add updateInterfaceIpState" am:
2dbd137795
am:
6f69ea87e7
Change-Id: I55d0e265488a67d0c379f19e47fbadff5ba51671
Rebecca Silberstein [Wed, 26 Apr 2017 20:58:25 +0000 (20:58 +0000)]
Merge "WifiManager: add updateInterfaceIpState"
am:
2dbd137795
Change-Id: I46b408b2c11e23946ab933b6c780a122ce1b2761
Julius D'souza [Wed, 26 Apr 2017 20:53:38 +0000 (20:53 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues. am:
31add96517
am:
a701205315
Change-Id: Ic524f1c10de53d0a9974afc4033c334ad871de4a
Rebecca Silberstein [Wed, 26 Apr 2017 20:49:04 +0000 (20:49 +0000)]
Merge "WifiManager: add updateInterfaceIpState"
Julius D'souza [Wed, 26 Apr 2017 20:47:26 +0000 (20:47 +0000)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.* This is to avoid API Level 25 CTS issues.
am:
31add96517
Change-Id: Id12dd73ed18fee0b874af364bad954d39384287f
Julius D'souza [Wed, 26 Apr 2017 18:14:00 +0000 (11:14 -0700)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*
This is to avoid API Level 25 CTS issues.
Bug:
37646165
Change-Id: I1fec4dc0b7497eb3dafb9c2f704bb02b8ecde1a9
nharold [Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d
am:
939528045a
Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224
nharold [Wed, 26 Apr 2017 17:21:52 +0000 (17:21 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
am:
01e368f26d
Change-Id: I82c0bf9fe401accd6928e411739f658966ac87a6
nharold [Wed, 26 Apr 2017 17:10:32 +0000 (17:10 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
Chen Xu [Wed, 26 Apr 2017 16:58:07 +0000 (16:58 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b
am:
e701b7ab34
Change-Id: I76289584e478c2e287c6fc66f75d3771cd502729
Chen Xu [Wed, 26 Apr 2017 16:51:22 +0000 (16:51 +0000)]
Merge "Extend carrier configs for visual voicemail"
am:
f4db619b0b
Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296
Chen Xu [Wed, 26 Apr 2017 16:42:09 +0000 (16:42 +0000)]
Merge "Extend carrier configs for visual voicemail"
Narayan Kamath [Wed, 26 Apr 2017 12:18:05 +0000 (12:18 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87
am:
9e9270ee3d
Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942
Narayan Kamath [Wed, 26 Apr 2017 12:12:29 +0000 (12:12 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
am:
2529f65e87
Change-Id: Iabbf138719296a882aa98261fb2c4da8bbf027cc
Narayan Kamath [Wed, 26 Apr 2017 12:01:15 +0000 (12:01 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
Nathan Harold [Tue, 25 Apr 2017 21:21:52 +0000 (14:21 -0700)]
Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.
Bug:
37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
Rebecca Silberstein [Fri, 21 Apr 2017 18:20:56 +0000 (11:20 -0700)]
WifiManager: add updateInterfaceIpState
Add a call to WifiManager that allows ConnectivityService to
provide interface mode change updates. Mode variables are also
added in this CL.
A corresponding CL will be added to WifiServiceImpl.
Fixed two checkstyle errors on imports.
Bug:
31466854
Test: make
Change-Id: Iccccd2643515a09fadb29f7b7e82697aaf994189
Pankaj Kanwar [Tue, 25 Apr 2017 23:46:17 +0000 (23:46 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am:
3a8ad81ab4
am:
a086824e5a
Change-Id: I2a918e4d56cbb6147c95737d7f6b156903dc5ec5
Pankaj Kanwar [Tue, 25 Apr 2017 23:40:54 +0000 (23:40 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am:
3a8ad81ab4
Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec
Pankaj Kanwar [Tue, 25 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
Hall Liu [Tue, 25 Apr 2017 22:32:02 +0000 (22:32 +0000)]
Merge "Add Error specifiers to the API." am:
4c4a55a67b
am:
f729fccde9
Change-Id: I91d077af7f001853df99d4ae4ba7da611c1dea09
Hall Liu [Tue, 25 Apr 2017 22:17:14 +0000 (22:17 +0000)]
Merge "Add Error specifiers to the API."
am:
4c4a55a67b
Change-Id: Ia720a230e0f7f7070ca7194dbcfce294a66a3574
Chen Xu [Tue, 25 Apr 2017 22:10:21 +0000 (22:10 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f
am:
ac78d9ae25
Change-Id: I541ad952ccab5a466e9d26c11478cc18fa69ddc0
Chen Xu [Tue, 25 Apr 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Add VisualVoicemailService"
am:
8c6925a88f
Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af
Hall Liu [Tue, 25 Apr 2017 22:03:41 +0000 (22:03 +0000)]
Merge "Add Error specifiers to the API."
Chen Xu [Tue, 25 Apr 2017 21:54:51 +0000 (21:54 +0000)]
Merge "Add VisualVoicemailService"
pkanwar [Thu, 19 Jan 2017 20:24:19 +0000 (12:24 -0800)]
Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.
BUG:
32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
Merged-In: If603aa37c774157f0a3af12ca4ac6bafad94340d
Jakub Pawlowski [Tue, 25 Apr 2017 19:56:43 +0000 (19:56 +0000)]
Merge "Bluetooth: expand comments on new PHY constants" am:
bdeb8539e8
am:
3e56fdba72
Change-Id: I092b69b4e9f3ebd9a29b5c31e76de37035d20843
Jakub Pawlowski [Tue, 25 Apr 2017 19:54:54 +0000 (19:54 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt" am:
1f4e111808
am:
41eae807ef
Change-Id: I5192fa676a27f6627c94984d5e689dc1ddd1d000
Jakub Pawlowski [Tue, 25 Apr 2017 19:50:30 +0000 (19:50 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
am:
bdeb8539e8
Change-Id: I5c2308f357ec419d5644ec57a014b2237e22e0aa
Jakub Pawlowski [Tue, 25 Apr 2017 19:48:19 +0000 (19:48 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
am:
1f4e111808
Change-Id: I878bfa78c10de91b3b1b83c00bc94ccc4aa77a27
Jakub Pawlowski [Tue, 25 Apr 2017 19:41:54 +0000 (19:41 +0000)]
Merge "Bluetooth: document status value in PHY read/update" am:
06abc2c404
am:
3d95c68d2e
Change-Id: I765bbeb4e21ef1102f92c708e93a339f928ee5e3
Treehugger Robot [Tue, 25 Apr 2017 19:36:35 +0000 (19:36 +0000)]
Merge "Bluetooth: expand comments on new PHY constants"
Treehugger Robot [Tue, 25 Apr 2017 19:36:20 +0000 (19:36 +0000)]
Merge "Bluetooth: Add handler parameter to connectGatt"
Jakub Pawlowski [Tue, 25 Apr 2017 19:32:15 +0000 (19:32 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
am:
06abc2c404
Change-Id: I758c26a86e9f0f5b8c80bb946682ad0eb865b152
Treehugger Robot [Tue, 25 Apr 2017 19:20:40 +0000 (19:20 +0000)]
Merge "Bluetooth: document status value in PHY read/update"
Jakub Pawlowski [Fri, 21 Apr 2017 11:26:12 +0000 (04:26 -0700)]
Bluetooth: expand comments on new PHY constants
Bug:
37544152
Test: the all-knowing eyes of the reviewers
Change-Id: I8f5a756a204fe90960700e1dc42f64824d3b844a
Jakub Pawlowski [Tue, 25 Apr 2017 15:07:11 +0000 (08:07 -0700)]
Bluetooth: document status value in PHY read/update
Bug:
37544152
Test: none
Change-Id: I2bac468f833c73cd282b1dac80b6553917996604
Jakub Pawlowski [Fri, 21 Apr 2017 10:49:00 +0000 (03:49 -0700)]
Bluetooth: Add handler parameter to connectGatt
Bug:
37544152
Test: sl4a GattReadTest GattWriteTest
Change-Id: I043dfefaafe9f3700418f2c855c52aac3644310f
Pankaj Kanwar [Tue, 25 Apr 2017 16:20:51 +0000 (16:20 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18
am:
d6465983f1
Change-Id: I0660aab378b2deee3f52e710a0a413b806dd0792
Pankaj Kanwar [Tue, 25 Apr 2017 16:14:14 +0000 (16:14 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
41f48e3f18
Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
Pankaj Kanwar [Tue, 25 Apr 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
Brian Carlstrom [Mon, 20 Mar 2017 00:43:12 +0000 (17:43 -0700)]
Improvements to ActivityManagerService stack dumping
- Deduplicate code in DumpStackFileObserver, ensure consistent behavior at addition use site
- Fix bug in DumpStackFileObserver where closed state was not reset
- Align TRACE_DUMP_TIMEOUT_MS with frameworks/native/cmds/dumpstate/utils.cpp
- Fallback to Debug.dumpNativeBacktraceToFileTimeout on timeout
- Share timeout constant with other Debug.dumpNativeBacktraceToFileTimeout caller
Test: Insert 1s sleep in system/bt/btif/src/bluetooth.cc is_profile to trigger ANR
Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug:
35962833
(cherry picked from commit
beed965c25d6996ed0f7947bf8a569ca4489f79e)
Merged-In: I6b5cc3f106f1e2b49400e382b8ad71ddbd4685f3
Change-Id: Ia2024bfa54a15a57821958d69b442d0bc9985eb6
Etan Cohen [Tue, 25 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06
am:
3c6305cc55
Change-Id: I4e2461f68db983292c167a11746b8cfe47995e77
Etan Cohen [Tue, 25 Apr 2017 13:27:22 +0000 (13:27 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
am:
2fd19ffa06
Change-Id: I8e4a38b113d6e8f81bc382715dda5c279771e454
Etan Cohen [Tue, 25 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
Ta-wei Yen [Fri, 16 Dec 2016 20:17:30 +0000 (12:17 -0800)]
Add VisualVoicemailService
VisualVoicemailService can be implemennted by the default dialer to
provide a visual voicemail client similar to the OMTP visual voicemail
spec.
Other APIs such as the SMS filter and hidden text SMS sending are made
public and consolidated into the service interface.
Test: make. CTS tests in a follow up CL
Change-Id: Ib5e9aa15fc098f4c13b15e5dbecf9ab646e0e400
Merged-in: Ib5e9aa15fc098f4c13b15e5dbecf9ab646e0e400
Ta-wei Yen [Tue, 17 Jan 2017 21:52:10 +0000 (13:52 -0800)]
Extend carrier configs for visual voicemail
This CL make the hidden config values in N MR1 public.
Test: constant changes
Bug:
34132192
Change-Id: Iff3f98a01ccd59edd809e5c7de0cdb445dee4d35
Merged-in: Iff3f98a01ccd59edd809e5c7de0cdb445dee4d35
Robert Greenwalt [Sat, 22 Apr 2017 03:30:14 +0000 (20:30 -0700)]
Add Error specifiers to the API.
Intend to make an mbms/ErrorCodes.java file or something to contain the
constants.
Test: none yet
Change-Id: Ic6554079e4cd38a8fd4afb100aeef86fbc06a42f
pkanwar [Mon, 7 Nov 2016 04:11:45 +0000 (20:11 -0800)]
Provide an API to make USSD calls and read the responses.
Test: will be added in a subsequent CL.
Bug:
30973910
Change-Id: Ibf622e154f3f987be547f4f85e15891d4e382118
Amith Yamasani [Mon, 24 Apr 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5
am:
0efa055590
Change-Id: Ibed5b8045215e0d4dd4e20aa2778ec5a16c715e2
Amith Yamasani [Mon, 24 Apr 2017 23:36:58 +0000 (23:36 +0000)]
Merge "Check Bluetooth app id instead of uid"
am:
7d4a354fd5
Change-Id: Ib79ace5311606520ae84c4ba37ffc64a538428d6
Treehugger Robot [Mon, 24 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Check Bluetooth app id instead of uid"
Amith Yamasani [Mon, 24 Apr 2017 18:30:19 +0000 (11:30 -0700)]
Check Bluetooth app id instead of uid
Fixes the crash on user switches.
Change-Id: If0c003011bd014b437ef5c8bee24a27b68be88d9
Fixes:
37617840
Test: manual - add a user
Pankaj Kanwar [Mon, 24 Apr 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6
am:
4ef0e826c4
Change-Id: I478837412fb4c76ac8d18fed5a5c441bf2d835b3
Pankaj Kanwar [Mon, 24 Apr 2017 20:04:05 +0000 (20:04 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
f02b7b7ba6
Change-Id: Iaaefbd5b0771a945035e4cddb219a86b2519607c
Pankaj Kanwar [Mon, 24 Apr 2017 19:52:32 +0000 (19:52 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
Jakub Pawlowski [Mon, 24 Apr 2017 19:11:07 +0000 (19:11 +0000)]
Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14
am:
2fb02a252c
Change-Id: Idbdbc555a141b6f231e91cf05525c7812118db49
Joachim Sauer [Mon, 24 Apr 2017 19:06:54 +0000 (19:06 +0000)]
Merge "Deprecate internal Calendar methods." am:
e08bd750c8
am:
5144cd445a
Change-Id: Ib45c306442053da5dac68a63bcf05c8550a4eae9
Hugo Benichi [Mon, 24 Apr 2017 18:58:54 +0000 (18:58 +0000)]
Merge "Move byte logics from ApfFilter into BitsUtil" am:
21b9b3a8ff
am:
12c1074c8b
Change-Id: Ib128cc07e0e9df634a495f50c02dee72d6b1bf9c
Jakub Pawlowski [Mon, 24 Apr 2017 18:57:25 +0000 (18:57 +0000)]
Merge "Get rid of the IAdvertiserCallabck"
am:
7503b11b14
Change-Id: I0c2ce2ba610fc4068c089a673200dfcc67624f02
Hugo Benichi [Mon, 24 Apr 2017 18:54:23 +0000 (18:54 +0000)]
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am:
10b5024d5e
am:
23d41ee68e
Change-Id: I2eb51c866ad016da0e0e37c71b2e6f1a8875ae36
Joachim Sauer [Mon, 24 Apr 2017 18:48:49 +0000 (18:48 +0000)]
Merge "Deprecate internal Calendar methods."
am:
e08bd750c8
Change-Id: I1cdcfa55a83f414fa8b0b72e2b9520e905d752ff
pkanwar [Sat, 15 Oct 2016 02:40:13 +0000 (19:40 -0700)]
Provide an API to make USSD calls and read the responses.
Test: will be added in a subsequent CL.
Bug:
30973910
Change-Id: Ic1214330ddf6846973d8bd28ee6ff1d28ae8c852
Merged-In: Ic1214330ddf6846973d8bd28ee6ff1d28ae8c852
Hugo Benichi [Mon, 24 Apr 2017 18:45:23 +0000 (18:45 +0000)]
Merge "Move byte logics from ApfFilter into BitsUtil"
am:
21b9b3a8ff
Change-Id: I9234b9dcb527de8a67bebab8cebc35e5b96aa986
Hugo Benichi [Mon, 24 Apr 2017 18:43:30 +0000 (18:43 +0000)]
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)"
am:
10b5024d5e
Change-Id: I5687677a8bf05769a7e11ba12947be2cf23a0040
Robin Lee [Mon, 24 Apr 2017 18:39:55 +0000 (18:39 +0000)]
Merge "Remove unused network management RPCs" am:
53a122986d
am:
10ebc1879b
Change-Id: I212537d25c70b3e2c4f895bba2957584f44ea075
Robin Lee [Mon, 24 Apr 2017 18:30:58 +0000 (18:30 +0000)]
Merge "Remove unused network management RPCs"
am:
53a122986d
Change-Id: I6c8c0aac1d362672579654ab2ad12045c91d66f2
Treehugger Robot [Mon, 24 Apr 2017 17:37:51 +0000 (17:37 +0000)]
Merge "Get rid of the IAdvertiserCallabck"
Joachim Sauer [Mon, 24 Apr 2017 15:44:02 +0000 (15:44 +0000)]
Merge "Deprecate internal Calendar methods."
Jakub Pawlowski [Wed, 19 Apr 2017 12:44:34 +0000 (05:44 -0700)]
Get rid of the IAdvertiserCallabck
Bug:
30622771
Test: none
Change-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971
Hugo Benichi [Mon, 24 Apr 2017 06:39:37 +0000 (06:39 +0000)]
Merge "Move byte logics from ApfFilter into BitsUtil"
Hugo Benichi [Sun, 23 Apr 2017 23:35:52 +0000 (23:35 +0000)]
Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)"
Robin Lee [Sat, 22 Apr 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Remove unused network management RPCs"
Hall Liu [Sat, 22 Apr 2017 02:06:28 +0000 (02:06 +0000)]
Merge "Second pass of eMBMS api." am:
c90fcbd660
am:
d61dc9e842
Change-Id: I9fa9152affeca04d18a1d185efd989b42fea3d49
Hall Liu [Sat, 22 Apr 2017 02:00:18 +0000 (02:00 +0000)]
Merge "Second pass of eMBMS api."
am:
c90fcbd660
Change-Id: If77c71951d6514429752fa9c1ba0f8835c7e610b
Hall Liu [Sat, 22 Apr 2017 01:53:11 +0000 (01:53 +0000)]
Merge "Second pass of eMBMS api."
Hugo Benichi [Thu, 12 Jan 2017 06:31:05 +0000 (15:31 +0900)]
Move byte logics from ApfFilter into BitsUtil
This patch extracts into BitUtils byte manipulation helper methods
and unsigned type manipulation helper methods from ApfFilter into
an independent and reusable structure.
Test: $ runtest frameworks-net
Change-Id: I0f33af10457a63dbde5983f14353a79b8cd877d9
Hugo Benichi [Wed, 22 Mar 2017 09:29:58 +0000 (18:29 +0900)]
Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)
This patch is a partial cherry-pick from commit
df456e13a1127e3c8594b1d22ea4a9b3dca67a4b for the BitUtils and
NetworkCapabilities classes.
Bug:
34901696
Test: none
(cherry picked from commit
df456e13a1127e3c8594b1d22ea4a9b3dca67a4b)
Merged-In: Id04f9080e7f75608deeb49306aec34941e71794c
Change-Id: I64eae49f646365b7cd1683a689315fe03bf0bdd9
Hugo Benichi [Sat, 22 Apr 2017 00:51:03 +0000 (00:51 +0000)]
Merge changes I5187d17c,I49a76582 am:
7781a6d4c1
am:
f2e5cf715d
Change-Id: Ia7298c92e50e00e139829498af00d80a5840d4cb
Hugo Benichi [Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)]
Merge "NsdManager: add unit tests" am:
dc54ad7fc3
am:
40ab8401b2
Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8
Hugo Benichi [Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)]
Merge changes I5187d17c,I49a76582
am:
7781a6d4c1
Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f
Hugo Benichi [Sat, 22 Apr 2017 00:40:56 +0000 (00:40 +0000)]
Merge "NsdManager: add unit tests"
am:
dc54ad7fc3
Change-Id: I928f19e359b7423d43d792c413de4195a64141a7
Hugo Benichi [Sat, 22 Apr 2017 00:34:07 +0000 (00:34 +0000)]
Merge changes I5187d17c,I49a76582
* changes:
ConnectivityService: regroup bool <-> int conversions
ConnectivityService: move reportNetworkConnectivity to handler
Hugo Benichi [Sat, 22 Apr 2017 00:31:27 +0000 (00:31 +0000)]
Merge "NsdManager: add unit tests"
Hall Liu [Sat, 22 Apr 2017 00:19:47 +0000 (00:19 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am:
d065cf049e
am:
cb93ac533d
Change-Id: I3e34e7bbebf2e4bfd12c0562d32037ece5c43ff6
Hall Liu [Sat, 22 Apr 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
am:
d065cf049e
Change-Id: Ie4afbc705810b3f370fb8e8d57be9053c6135083
Treehugger Robot [Sat, 22 Apr 2017 00:01:50 +0000 (00:01 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
Robert Greenwalt [Fri, 21 Apr 2017 23:29:47 +0000 (23:29 +0000)]
Merge "Mark Restricted APN connections as restricted." am:
b90b2015d3
am:
1778682242
Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f
Robert Greenwalt [Fri, 21 Apr 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Mark Restricted APN connections as restricted."
am:
b90b2015d3
Change-Id: Icd54c671035da752663d9ec125f999298aa1d8e7
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."
Robin Lee [Fri, 21 Apr 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am:
e4f56a7e44
am:
cd8557d15a
Change-Id: I4e0aa1a88c259b77d7a9ac9e1dd02566e415005d
Robin Lee [Fri, 21 Apr 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
am:
e4f56a7e44
Change-Id: I80b3607fd1c61875be8354439e09db56a0bd391d
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.
If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.
This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.
bug:
37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest. Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac
Treehugger Robot [Fri, 21 Apr 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
Hall Liu [Fri, 21 Apr 2017 21:33:12 +0000 (14:33 -0700)]
Remove default public ctor from RttModifyStatus
Test: builds
Bug:
37515063
Change-Id: I1e573d945b48e28d12621078cc8f37eb076d9ee3
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927