OSDN Git Service
Jordan Liu [Wed, 1 May 2019 22:02:42 +0000 (15:02 -0700)]
Merge "Update getUiccCardsInfo doc"
am:
39fbf96b5a
Change-Id: I2b3af7fb26bfd5e403401daaac37888877bca851
Xiangyu/Malcolm Chen [Wed, 1 May 2019 21:57:16 +0000 (14:57 -0700)]
Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM."
am:
d3daa7a40e
Change-Id: I8e5d90ed969058b359321aeb6af8492f72d3a2f5
Jordan Liu [Wed, 1 May 2019 21:32:46 +0000 (21:32 +0000)]
Merge "Update getUiccCardsInfo doc"
Xiangyu/Malcolm Chen [Wed, 1 May 2019 20:49:16 +0000 (20:49 +0000)]
Merge "Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM."
Holly Jiuyu Sun [Mon, 15 Apr 2019 21:04:12 +0000 (14:04 -0700)]
Add EuiccManager#EXTRA_PHYSICAL_SLOT_ID to detect it's an operation for pSIM.
Platform needs to pass LPA the pSIM slotId so that LPA knows it's a
toggle action on pSIM.
Bug:
123945155
Test: build
Change-Id: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
Merged-In: Ie0db50e8ade4c6ce385ebfbfe7cf9e2982d67e34
Jordan Liu [Mon, 22 Apr 2019 22:16:10 +0000 (15:16 -0700)]
Update getUiccCardsInfo doc
This method will return info for inactive eUICCs, filtered by carrier
privilege. (Since we can't read carrier privilege on an inactive eUICC,
we always assume that the caller does not have carrier privilege).
Bug:
130826215
Test: manual
Change-Id: Id89fa48f119004b6c18bd21791396bc6c3df2c95
Merged-In: Id89fa48f119004b6c18bd21791396bc6c3df2c95
Milim [Wed, 1 May 2019 15:20:55 +0000 (08:20 -0700)]
Merge "Support IPv6 Bluetooth tethering"
am:
b4f69b3cd0
Change-Id: Ic3ddb1a55d7b09054fc73c41d58337f4ed635a99
Treehugger Robot [Wed, 1 May 2019 15:12:21 +0000 (15:12 +0000)]
Merge "Support IPv6 Bluetooth tethering"
Lorenzo Colitti [Wed, 1 May 2019 14:30:59 +0000 (07:30 -0700)]
Merge "Make NetworkStack actually build in an unbundled setup."
am:
625173c148
Change-Id: Ib76bcc82b2562831934a81d4536e83f37c08b3e8
David Brazdil [Wed, 1 May 2019 14:22:26 +0000 (07:22 -0700)]
Merge "hiddenapi: Support greylist-max-q"
am:
d749f8a4e7
Change-Id: Ibb96ef09ed1530e5f3cb1cba9430862310aab271
Treehugger Robot [Wed, 1 May 2019 14:04:59 +0000 (14:04 +0000)]
Merge "Make NetworkStack actually build in an unbundled setup."
Treehugger Robot [Wed, 1 May 2019 14:01:29 +0000 (14:01 +0000)]
Merge "hiddenapi: Support greylist-max-q"
Lorenzo Colitti [Wed, 1 May 2019 02:54:33 +0000 (11:54 +0900)]
Make NetworkStack actually build in an unbundled setup.
The Java code was already using sdk_version: "current", but the
JNI library did not have an sdk_version attribute, and had
forbidden dependencies on internal libraries such as libcutils,
liblog and libnativehelper.
This CL fixes things as follows:
- Use the NDK log functions, and switch to the NDK liblog.
- Switch to the NDK libnativehelper.
- Drop the dependencies on libcutils and libpcap, which were
unused.
- Use the libc++ STL, and set the sdk_version of the library to
current.
Bug:
131703417
Test: m
Test: installed NetworkStack APK via "adb install --staged" results in working networking
Test: builds, boots, wifi works
Test: atest FrameworksNetTests NetworkStackTests
(cherry picked from commit
3d680e887ba40cde436a5745578e67d4a6a6fce9)
Change-Id: I8a0a8d4b4e8872cb88ee526772ae519a8e6df615
Milim [Tue, 30 Apr 2019 06:19:28 +0000 (15:19 +0900)]
Support IPv6 Bluetooth tethering
Test: build
Fix:
130843211
Change-Id: I6dac50b39aabad1fd907325090af6aaf53d68c67
David Brazdil [Wed, 1 May 2019 10:57:05 +0000 (11:57 +0100)]
hiddenapi: Support greylist-max-q
Test: set maxTargetSdk=Q on an API, compiles, check hiddenapi-flags.csv
Change-Id: I990972d652d4f4bc578592a9b3d9954f93b1ab9f
Steven Moreland [Wed, 1 May 2019 00:22:27 +0000 (17:22 -0700)]
Merge "HwBinder: call _exit over exit."
am:
aec3eca591
Change-Id: I6121b8cfef034c5028522bd4e849e1c9c12649db
Treehugger Robot [Tue, 30 Apr 2019 23:46:35 +0000 (23:46 +0000)]
Merge "HwBinder: call _exit over exit."
Michael Plass [Tue, 30 Apr 2019 22:40:20 +0000 (15:40 -0700)]
Merge "Fix tests/runtests.sh"
am:
be62c313ad
Change-Id: I90b51e0fd0a14d03f4b0ea7a05a0c5dd08ca8708
Michael Plass [Tue, 30 Apr 2019 22:12:38 +0000 (22:12 +0000)]
Merge "Fix tests/runtests.sh"
Tyler Gunn [Tue, 30 Apr 2019 20:41:33 +0000 (13:41 -0700)]
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS."
am:
09d4aba478
Change-Id: I91b75c13d087f55aec05c63a17528447e6869124
Tyler Gunn [Tue, 30 Apr 2019 20:30:13 +0000 (20:30 +0000)]
Merge "Add PhoneAccountHandle method to check if 2 accts are from same CS."
Al Sutton [Tue, 30 Apr 2019 07:46:27 +0000 (00:46 -0700)]
[automerger skipped] Merge "Update team members in the OWNERS file. DO NOT MERGE"
am:
f8e199f033 -s ours
am skip reason: subject contains skip directive
Change-Id: I260270ea1d5e8a41fc4e8ec8baa749bbb53b97d6
Al Sutton [Tue, 30 Apr 2019 07:30:24 +0000 (07:30 +0000)]
Merge "Update team members in the OWNERS file. DO NOT MERGE"
Benedict Wong [Mon, 29 Apr 2019 20:35:37 +0000 (13:35 -0700)]
Merge "Add EPROTONOSUPPORT to IpSecManager SSE map"
am:
7050ce9434
Change-Id: I9ab4161e2b04615ce782c89cd9e99d98cdbdc92d
Benedict Wong [Mon, 29 Apr 2019 19:59:38 +0000 (19:59 +0000)]
Merge "Add EPROTONOSUPPORT to IpSecManager SSE map"
Steven Moreland [Mon, 29 Apr 2019 17:00:04 +0000 (10:00 -0700)]
HwBinder: call _exit over exit.
Avoid calls to static destructors.
Fixes:
131589658
Test: TH
Change-Id: I52ddcda75e902965f8d4a13f4851e6bdcbe4b0e5
Mark Chien [Mon, 29 Apr 2019 16:17:46 +0000 (09:17 -0700)]
Merge "Support adding NATT keepalive packet filter"
am:
d157594a2a
Change-Id: I9618b519f4bd4d5f1edbcede3a3bd727110c2a7e
Mark Chien [Mon, 29 Apr 2019 15:59:16 +0000 (15:59 +0000)]
Merge "Support adding NATT keepalive packet filter"
Paul Hu [Mon, 29 Apr 2019 15:50:18 +0000 (08:50 -0700)]
Merge "Add Network, NetworkCapabilities, StaticIpConfiguration common test cases"
am:
450a353334
Change-Id: Id469ce450ac84d967ee19ecad44dae6905187a59
Paul Hu [Mon, 29 Apr 2019 15:38:48 +0000 (15:38 +0000)]
Merge "Add Network, NetworkCapabilities, StaticIpConfiguration common test cases"
Lorenzo Colitti [Mon, 29 Apr 2019 14:09:27 +0000 (07:09 -0700)]
Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2."
am:
e3cc932d27
Change-Id: Id9f6d26a2dacdb2b57eaf27441fe2a94bf76eb74
Treehugger Robot [Mon, 29 Apr 2019 13:55:06 +0000 (13:55 +0000)]
Merge "Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2."
Aaron Huang [Fri, 19 Apr 2019 14:47:26 +0000 (22:47 +0800)]
Support adding NATT keepalive packet filter
Support adding NATT keepalive packet filter to APF
filter.
Generating APF program will be addressed in another CL.
Bug:
33530442
Test: - atest NetworkStackTests
- atest FrameworksNetTests
Change-Id: I4961d5da343d8700600269632787c28112f0f9f1
Al Sutton [Wed, 24 Apr 2019 16:59:08 +0000 (17:59 +0100)]
Update team members in the OWNERS file. DO NOT MERGE
Change-Id: I7f23507e1ec9a5763579160f7942bf2f55df1bfb
Test: build/make/tools/checkowners.py -c -v OWNERS
Fixes:
129861520
Mark Chien [Mon, 29 Apr 2019 10:49:03 +0000 (03:49 -0700)]
Merge "Add AIDL parcelable for NattKeepalivePacketData"
am:
6d7ed60834
Change-Id: Idd5ff9d4d52064dbfe5df1e4677c41bcccd9c09a
Lorenzo Colitti [Mon, 29 Apr 2019 10:32:42 +0000 (19:32 +0900)]
Freeze {ipmemorystore,networkstack}-aidl-interfaces as version 2.
Generated with:
m networkstack-aidl-interfaces-freeze-api \
ipmemorystore-aidl-interfaces-freeze-api
Test: builds, boots
Bug:
128803828
Change-Id: I079018679766738a97b827bc87a6903655f308dd
Mark Chien [Mon, 29 Apr 2019 10:26:35 +0000 (10:26 +0000)]
Merge "Add AIDL parcelable for NattKeepalivePacketData"
paulhu [Mon, 29 Apr 2019 10:07:51 +0000 (18:07 +0800)]
Add Network, NetworkCapabilities, StaticIpConfiguration common test cases
Bug:
129200415
Bug:
129200142
Bug:
129200418
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Change-Id: I568d516e1ffc9e32061ca6860224c102bdfd7445
Lorenzo Colitti [Mon, 29 Apr 2019 01:50:00 +0000 (18:50 -0700)]
Merge "Revert "Make the network stack a persistent process.""
am:
d38eaa8820
Change-Id: I15a7495debbcf6a4b1960d1e7307120afa485830
Lorenzo Colitti [Mon, 29 Apr 2019 01:40:34 +0000 (01:40 +0000)]
Merge "Revert "Make the network stack a persistent process.""
Lorenzo Colitti [Mon, 29 Apr 2019 01:12:51 +0000 (18:12 -0700)]
Merge changes Ia9865c75,I47d9d53d,Idbe10c36
am:
da1df963e6
Change-Id: I75fb2a070f4490414d268cefa3702fde13c01f91
Lorenzo Colitti [Mon, 29 Apr 2019 00:50:30 +0000 (00:50 +0000)]
Merge changes Ia9865c75,I47d9d53d,Idbe10c36
* changes:
Fix some checkstyle nits in DhcpPacketTest.
Additional code for server name in DHCP packets.
Parse the server host name field of the dhcp package
Lorenzo Colitti [Sat, 27 Apr 2019 15:02:50 +0000 (15:02 +0000)]
Revert "Make the network stack a persistent process."
This reverts commit
796afddd6c7012dc7f10bc2557eb06767c5d873a.
Reason for revert: breaks updatability because persistent processes are not updatable.
Change-Id: I35ded113b31e742f13ad8523a10af3a83a111374
Lorenzo Colitti [Sat, 27 Apr 2019 07:36:39 +0000 (16:36 +0900)]
Fix some checkstyle nits in DhcpPacketTest.
Use the Generated code suppression comment filter instead of the
IndentationCheck suppression comment filter because the latter
complains that '+' should be on a new line.
Bug:
120584519
Bug:
127423755
Test: atest NetworkStackTests
Test: atest FrameworksNetTests
Change-Id: Ia9865c75f940e2fbb3aef374a297339e8ea2fd1b
Lorenzo Colitti [Fri, 26 Apr 2019 10:10:20 +0000 (19:10 +0900)]
Additional code for server name in DHCP packets.
- Add the hostname to DhcpResultsParcelable.
- Don't store the server hostname if option overload is in use,
as this is not valid.
- Add unit tests.
Bug:
120584519
Bug:
127423755
Test: atest NetworkStackTests
Test: atest FrameworksNetTests
Change-Id: I47d9d53d1fb58968322cc8b071a44fbc8f7156e1
Otto Seiskari [Fri, 12 Apr 2019 10:16:14 +0000 (13:16 +0300)]
Fix tests/runtests.sh
The location of FrameworksWifiTests.apk installed by the script
with adb seems to have changed. The path of the APK contains the
TARGET_ARCH environment variable, which is now fetched
with a similar method as in system/netd/tests/runtests.sh.
Noticed the issue with "lunch aosp_x86_64-eng". Before this fix,
the test script produced an error:
adb: failed to stat [...]/FrameworksWifiApiTests.apk:
No such file or directory
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf
Merged-In: Id4a33ca89fa21a9a4ef791c5c1c5760e0e2badaf
Signed-off-by: Otto Seiskari <otto.seiskari@indooratlas.com>
yuanyunli [Wed, 9 Jan 2019 08:59:37 +0000 (16:59 +0800)]
Parse the server host name field of the dhcp package
Some hotspot devices will fill in the server host name field of the DHCP
package, such as iphone. Parsing the server host name of the DHCP
package can help identify ios hotspots.
Bug:
120584519
Test:
127423755
Test: builds, boots, wifi works
Change-Id: Idbe10c36332ce421f1bba93eb87e9e1e12463088
Sasha Smundak [Fri, 26 Apr 2019 13:26:28 +0000 (06:26 -0700)]
Merge "Convert misc tests Android.mk files to Android.bp"
am:
ce22e11274
Change-Id: I5389c6ba0e11204676c6a13175be781e26bb8905
Treehugger Robot [Fri, 26 Apr 2019 13:10:24 +0000 (13:10 +0000)]
Merge "Convert misc tests Android.mk files to Android.bp"
Lorenzo Colitti [Fri, 26 Apr 2019 10:49:26 +0000 (03:49 -0700)]
Merge "Add validation type definition to support multiple probe result"
am:
3bdd969ff7
Change-Id: Iad7e1577483bde7e7525943849ec2f91d4d1bfd7
Lorenzo Colitti [Fri, 26 Apr 2019 10:32:19 +0000 (10:32 +0000)]
Merge "Add validation type definition to support multiple probe result"
Lorenzo Colitti [Fri, 26 Apr 2019 00:38:23 +0000 (17:38 -0700)]
Merge "Make DNS cache lifecycle management explicit"
am:
a6d5664819
Change-Id: Ie97fe453c89476915f3b362b6486c7d4608da2a9
Lorenzo Colitti [Fri, 26 Apr 2019 00:23:22 +0000 (00:23 +0000)]
Merge "Make DNS cache lifecycle management explicit"
Pengquan Meng [Thu, 25 Apr 2019 22:18:45 +0000 (15:18 -0700)]
Merge "Fixed the comment of carrier config for CDNR"
am:
e994a0d66a
Change-Id: I33dddc12e64b681e23e5600ab4a1c9cf560f795b
Pengquan Meng [Thu, 25 Apr 2019 22:07:25 +0000 (22:07 +0000)]
Merge "Fixed the comment of carrier config for CDNR"
Pengquan Meng [Tue, 23 Apr 2019 20:55:02 +0000 (13:55 -0700)]
Fixed the comment of carrier config for CDNR
Bug:
122921456
Test: build
Merged-In: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
Change-Id: If5cc8d37ba1e66d59e5bfe9444fe4108f2263be9
(cherry picked from commit
7ac9a8f314ad8be530f6745a947b90bfcff9495c)
Chiachang Wang [Thu, 25 Apr 2019 15:58:27 +0000 (23:58 +0800)]
Add validation type definition to support multiple probe result
In order to allow NetworkMonitor to tell ConnectivityService
if the network is either parital, validated or both.
NetworkMonitor could update the probe result by passing the
bitmask to ConnectivityService.
Bug:
130078798
Bug:
130683832
Test: build
Change-Id: I429ccbd9b9afae3eafaf73b3c9eb835213c1f64d
Chiachang Wang [Thu, 25 Apr 2019 05:05:10 +0000 (22:05 -0700)]
Merge "Remove Settings constants for NetworkStack"
am:
d32d766a04
Change-Id: Icba412d89c10a64d7e5d3d396b6a1364f7ad6bc5
Chiachang Wang [Thu, 25 Apr 2019 04:49:04 +0000 (04:49 +0000)]
Merge "Remove Settings constants for NetworkStack"
Chiachang Wang [Thu, 25 Apr 2019 04:19:45 +0000 (21:19 -0700)]
Merge "Update exception type thrown when NetworkStack is missing"
am:
fb60c85219
Change-Id: Icbf7db83d73a1912573e71c71f694f2d37d788af
Chiachang Wang [Thu, 25 Apr 2019 03:48:52 +0000 (03:48 +0000)]
Merge "Update exception type thrown when NetworkStack is missing"
Chiachang Wang [Thu, 25 Apr 2019 01:47:27 +0000 (09:47 +0800)]
Remove Settings constants for NetworkStack
The definitions reference of these constants are moved from
Settings to DeviceConfig. These definitions are @hide and the
usage in the Settings are removed. Thus, remove the definitions
from API level.
Bug:
123167629
Test: make system-api-stubs-docs-update-current-api \
test-api-stubs-docs-update-current-api
Test: atest NetworkStackTests
Change-Id: I28c4bf2c0b72e154cea91d11007a9497c7f21570
Merged-In: I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab
Merged-In: Ic48bea07e79490dd3787068bc88c748525752a61
Lorenzo Colitti [Thu, 25 Apr 2019 02:19:33 +0000 (19:19 -0700)]
Merge "Add privapp permissions to network modules."
am:
f11bd352b4
Change-Id: Iebd6224cb61bd35dd6cb6470cb4ac3ad0f1eced7
Lorenzo Colitti [Thu, 25 Apr 2019 02:05:19 +0000 (02:05 +0000)]
Merge "Add privapp permissions to network modules."
Leland Miller [Thu, 25 Apr 2019 00:15:18 +0000 (17:15 -0700)]
Merge "Use injected instance of RcsControllerCall"
am:
f545515ee6
Change-Id: Id364fe89943027eb1ec9f60b7457126ff8945b16
Treehugger Robot [Wed, 24 Apr 2019 23:48:40 +0000 (23:48 +0000)]
Merge "Use injected instance of RcsControllerCall"
Jordan Liu [Wed, 24 Apr 2019 23:18:34 +0000 (16:18 -0700)]
Merge "Do not populate SLOT_KEY with wrong slot info"
am:
b3fded4d17
Change-Id: Idf9900e5201c242651e1491235bdeaced4ec8292
Jordan Liu [Wed, 24 Apr 2019 23:04:25 +0000 (23:04 +0000)]
Merge "Do not populate SLOT_KEY with wrong slot info"
Benedict Wong [Mon, 16 Jul 2018 21:56:20 +0000 (14:56 -0700)]
Add EPROTONOSUPPORT to IpSecManager SSE map
This change maps EPROTONOSUPPORT to the list of error codes that map to
UnsupportedOperationException in IpSecManager.
Bug:
80103456
Test: Compiles, CTS tests ran
Change-Id: Iec3d5fc4a9bcad7c104414afefae775232d46558
Jordan Liu [Mon, 22 Apr 2019 20:58:02 +0000 (13:58 -0700)]
Do not populate SLOT_KEY with wrong slot info
The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).
For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/
130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.
Bug:
130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
Merged-In: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
SongFerng Wang [Wed, 24 Apr 2019 16:54:21 +0000 (09:54 -0700)]
Merge "Add 5G evolution icon"
am:
8442966df9
Change-Id: I9f8d0a708ab5f958c6ceb0ce67cd812298db415b
SongFerng Wang [Wed, 24 Apr 2019 16:41:14 +0000 (16:41 +0000)]
Merge "Add 5G evolution icon"
Lorenzo Colitti [Wed, 24 Apr 2019 16:37:50 +0000 (09:37 -0700)]
Merge "Make the network stack a persistent process."
am:
d0e7befaaf
Change-Id: I7de9d01aa2ee0d71f7c862e530d86b4a136013a6
Treehugger Robot [Wed, 24 Apr 2019 16:25:24 +0000 (16:25 +0000)]
Merge "Make the network stack a persistent process."
SongFerngWang [Thu, 21 Mar 2019 15:14:20 +0000 (23:14 +0800)]
Add 5G evolution icon
This add the 5GE icon to the system UI for specific carriers
LTE CA network.
Bug:
124768697
Test: build & manually test:
fake the operator name with pattern, and check the status bar data icon.
Change-Id: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Merged-In: Ife0401219138c7ed22e7bfbd4d5e8648c54a98a8
Rubin Xu [Wed, 24 Apr 2019 14:43:27 +0000 (07:43 -0700)]
Merge "Remove unused methods from INetworkManagementService"
am:
5d2c5d5dc2
Change-Id: Ie37c9c751830d209d40772bd2d410a9c550236cd
Treehugger Robot [Wed, 24 Apr 2019 14:29:39 +0000 (14:29 +0000)]
Merge "Remove unused methods from INetworkManagementService"
Lorenzo Colitti [Wed, 24 Apr 2019 13:51:49 +0000 (22:51 +0900)]
Add privapp permissions to network modules.
When built as part of the system, the network stack and the
captive portal login app should have the BYPASS_PRIVATE_DNS
and CONNECTIVITY_USE_RESTRICTED_NETWORKS permissions.
These are necessary to validate restricted networks, bypass VPNs,
bypass private DNS for captive portal login, etc. Add these
permissions to privapp-permissions-platform.xml.
When installed as mainline modules that cannot use signature
permissions, the modules get this ability by virtue of having the
MAINLINE_NETWORK_STACK permissions.
Additionally, add the CONNECTIVITY_USE_RESTRICTED_NETWORKS
permission to the captive portal login app manifest, which did
not contain it.
Bug:
129789428
Test: builds, boots
Test: dumpsys package shows permissions
Change-Id: I632359f7eff09fed71167733ac75824a5aa57894
Chiachang Wang [Wed, 24 Apr 2019 13:44:05 +0000 (21:44 +0800)]
Update exception type thrown when NetworkStack is missing
rethrowFromSystemServer is throwing DeadSystemException which
is different from the original log message. Thus, update the
way to rethrow the same RemoteException.
Bug:
130028724
Test: atest FrameworksNetTest
Test: Kill NetworkStack and check the log message
Change-Id: I60862e276dd4e2d143278b272a9ba54219acce26
Lorenzo Colitti [Wed, 24 Apr 2019 13:26:42 +0000 (22:26 +0900)]
Make the network stack a persistent process.
The network stack should never be killed, because if it does,
recovering networking requires a reboot. Make the process
persistent to reduce the chances of it being killed by the OOM
killer.
Bug:
131046856
Test: builds, boots
Test: process oom_score_adj is -800
Test: process goes from "Persistent Service" to "Persistent" in dumpsys meminfo
Change-Id: Ic8ebf6356e23489f6cd984d680ff9f1b4cbbe52d
Neil Fuller [Wed, 24 Apr 2019 13:08:15 +0000 (06:08 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am:
6badf7c7da
Change-Id: I0af52cb2289e1df89ac65fa01334d4e9de69e010
Neil Fuller [Wed, 24 Apr 2019 12:57:25 +0000 (12:57 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"
Lorenzo Colitti [Wed, 24 Apr 2019 09:57:48 +0000 (02:57 -0700)]
Merge "Delete unused timeout constant."
am:
1439bbb6d5
Change-Id: I341540745196f1d23fb95263a8948561cdfa4c8e
Rubin Xu [Wed, 24 Apr 2019 09:53:44 +0000 (02:53 -0700)]
Merge "Reinstate new VPN uid filtering unit tests"
am:
554a15d5ea
Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
Treehugger Robot [Wed, 24 Apr 2019 09:44:14 +0000 (09:44 +0000)]
Merge "Delete unused timeout constant."
Treehugger Robot [Wed, 24 Apr 2019 09:37:49 +0000 (09:37 +0000)]
Merge "Reinstate new VPN uid filtering unit tests"
Aaron Huang [Tue, 23 Apr 2019 14:17:16 +0000 (22:17 +0800)]
Add AIDL parcelable for NattKeepalivePacketData
Bug:
33530442
Test: atest FrameworksNetTests
Change-Id: I9b9a51dc5dc06c90229fb36c34c24258991c4146
Lorenzo Colitti [Wed, 24 Apr 2019 08:09:08 +0000 (17:09 +0900)]
Delete unused timeout constant.
Test: m
Bug:
129312219
Change-Id: I5b4c8b42dea515f674ff10d64d0e1d06d849cca1
Leland Miller [Wed, 24 Apr 2019 06:30:26 +0000 (23:30 -0700)]
Merge "Create new RcsMessageQueryResultParcelable"
am:
6af6e3a4f6
Change-Id: Id86442efa84f9c2ed49dc362f4a17466851dacfe
Treehugger Robot [Wed, 24 Apr 2019 06:12:47 +0000 (06:12 +0000)]
Merge "Create new RcsMessageQueryResultParcelable"
Aaron Huang [Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)]
Merge "Move NattKeepalivePacketData out of the framework"
am:
833edcbb1b
Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
Aaron Huang [Wed, 24 Apr 2019 04:00:56 +0000 (04:00 +0000)]
Merge "Move NattKeepalivePacketData out of the framework"
Tyler Gunn [Tue, 23 Apr 2019 21:49:19 +0000 (14:49 -0700)]
Merge "Update API docs for country ISO APIs."
am:
990053e552
Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
Tyler Gunn [Tue, 23 Apr 2019 21:40:12 +0000 (21:40 +0000)]
Merge "Update API docs for country ISO APIs."
Pengquan Meng [Tue, 23 Apr 2019 20:39:26 +0000 (13:39 -0700)]
Merge "Add carrier display name related CarrierConfig"
am:
570f5dcae1
Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
Pengquan Meng [Tue, 23 Apr 2019 20:23:20 +0000 (20:23 +0000)]
Merge "Add carrier display name related CarrierConfig"
Christopher Ferris [Tue, 23 Apr 2019 18:03:08 +0000 (11:03 -0700)]
Merge "Move to android_mallopt for malloc debug calls."
am:
aba4de21e0
Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
Christopher Ferris [Tue, 23 Apr 2019 17:45:01 +0000 (17:45 +0000)]
Merge "Move to android_mallopt for malloc debug calls."
Jack Yu [Tue, 23 Apr 2019 17:21:10 +0000 (10:21 -0700)]
Merge "Fixed that emergency alert dialog not popped up"
am:
4da7f91b23
Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb
Rubin Xu [Tue, 23 Apr 2019 17:04:14 +0000 (18:04 +0100)]
Reinstate new VPN uid filtering unit tests
Mock out PackageManager and returns correct information corresponding
to the test app package itself.
Test: atest --generate-new-metrics 10 com.android.server.ConnectivityServiceTest
Bug:
114231106
Bug:
130397860
Change-Id: Ib921700eda417f411d7a2c77c1140fba9ab50bbb