Android Build Merger (Role)
22a8239b6a
Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master
2019-01-29 23:14:51 +00:00
Jordan Liu
009b88526f
Merge "Card ID APIs are public"
...
am: bd4a4dc889
Change-Id: Ie436f74a0501d46ac12ea641ab71741fc6cbf3ba
2019-01-29 15:13:25 -08:00
Jordan Liu
a039e692a4
Merge "Card ID APIs are public"
...
am: bd4a4dc889
Change-Id: I2cf670328f7b2f35d6009eecb0e3741311d6e2df
2019-01-29 15:06:01 -08:00
Jordan Liu
bd4a4dc889
Merge "Card ID APIs are public"
2019-01-29 22:43:47 +00:00
Sooraj Sasindran
c3bf9392ac
Merge "Define more thresholds for opportunistic data"
...
am: cf2e069962
Change-Id: I8426e90c7f8a6b251e3bfdf0e2f3f0cf819fa777
2019-01-29 12:09:58 -08:00
Jack He
b7493c6059
Merge changes I94d15307,I7deb8556,I755b3140
...
am: 5aef5c6508
Change-Id: I2e38b52aeff244bdec199907f5cf90ce23ecbbfe
2019-01-29 11:53:43 -08:00
Sooraj Sasindran
cf2e069962
Merge "Define more thresholds for opportunistic data"
2019-01-29 19:43:26 +00:00
Treehugger Robot
5aef5c6508
Merge changes I94d15307,I7deb8556,I755b3140
...
* changes:
Atom: Add more Bluetooth atoms
Atom: Add A2DP playback related atoms to StatsLog
Fix typo in hci/enums.proto: OCCURED -> OCCURRED
2019-01-29 19:27:53 +00:00
Jordan Liu
d6c684fff4
Card ID APIs are public
...
These were system API but we should expose them for apps with carrier
privileges.
Test: manual
Bug: 122974656
Change-Id: Ie60e4c580dfa9dd0d7d6fb6b94226661d0620dad
2019-01-29 10:55:35 -08:00
Michele Berionne
e7d03a6ff1
Merge "Add check for slot index value"
...
am: d8148b6c8c
Change-Id: I33be18a2fb8b3e35e521bdea28354ba1b7daa5b9
2019-01-29 09:34:53 -08:00
Michele Berionne
d8148b6c8c
Merge "Add check for slot index value"
2019-01-29 17:25:17 +00:00
Adrian Roos
f9cd2cb759
Merge "apilint: Allow parsing 3.0 signature files"
...
am: 34b11c92b3
Change-Id: I0cc45b11f079c7a0d383b49e74d55658a8915d71
2019-01-29 08:23:14 -08:00
Adrian Roos
34b11c92b3
Merge "apilint: Allow parsing 3.0 signature files"
2019-01-29 16:05:21 +00:00
Remi NGUYEN VAN
04f4e4ed88
Merge "Revert "Extract network observer code from NetworkManagementService.""
...
am: 9fdc6d2963
Change-Id: Ib4a7b32a143b3c8f029ccd92191494cd9579e8bd
2019-01-29 06:47:16 -08:00
Remi NGUYEN VAN
9fdc6d2963
Merge "Revert "Extract network observer code from NetworkManagementService.""
2019-01-29 14:30:56 +00:00
Adrian Roos
cf82e04400
apilint: Allow parsing 3.0 signature files
...
Test: python apilint_test.py
Change-Id: I59df950229c05329afde93f94efc13adb4640ad7
2019-01-29 15:01:28 +01:00
Chalard Jean
06318332ef
Merge "Move FdEventsReader to the shared area."
...
am: 4a838a68d6
Change-Id: I27ecc795228c7bd91c8443a9ba3dad19d8010cf8
2019-01-29 04:11:44 -08:00
Treehugger Robot
4a838a68d6
Merge "Move FdEventsReader to the shared area."
2019-01-29 11:45:15 +00:00
Remi NGUYEN VAN
d91372e4cb
Merge "Run IpClientLinkObserver on Binder thread"
...
am: f89a1cfd21
Change-Id: I13c2a2c9c03c26777eb9c57e0ec62eab3d2df7da
2019-01-29 03:25:26 -08:00
Remi NGUYEN VAN
dfa16fe772
Merge "Add utils connect, setsockopt, bind, sendTo"
...
am: 1e002eede3
Change-Id: Ida2a99f35affe3cb9213f71ba622ace51c4d6f57
2019-01-29 03:21:22 -08:00
Remi NGUYEN VAN
ca1d65e707
Merge "Add NetworkUtils utilities to SystemApi"
...
am: 9cc31061fe
Change-Id: I82f20718d86b08cd0916ee33300ca0ee734305a6
2019-01-29 03:17:41 -08:00
Remi NGUYEN VAN
f89a1cfd21
Merge "Run IpClientLinkObserver on Binder thread"
2019-01-29 11:07:42 +00:00
Remi NGUYEN VAN
1e002eede3
Merge "Add utils connect, setsockopt, bind, sendTo"
2019-01-29 11:07:20 +00:00
Remi NGUYEN VAN
9cc31061fe
Merge "Add NetworkUtils utilities to SystemApi"
2019-01-29 11:07:04 +00:00
Remi NGUYEN VAN
bfd0aa022e
Revert "Extract network observer code from NetworkManagementService."
...
This reverts commit d8bc829a85 .
Reason for revert: Refactoring was unnecessary
Merged-In: Ib4e7da3274e49f25676505a08e6ce7e7b0dfdb8d
Change-Id: Iff332c680315b560f0b762c1d7311ec83d539115
2019-01-29 10:21:19 +00:00
Chalard Jean
0bf364d92e
Move FdEventsReader to the shared area.
...
This is necessary both in the network stack app and the
framework.
Test: FrameworksNetTests
Change-Id: I48af0ab29405501f0581a6c0c9ce6e5d4a32c8b4
2019-01-29 18:35:11 +09:00
Remi NGUYEN VAN
3af3f76129
Merge "Remove IpClient usage of NetworkManagementService"
...
am: 9fe79edfd2
Change-Id: Ia66a457d3cb73c92c97de025348724fa3f5cbc55
2019-01-29 01:16:21 -08:00
Remi NGUYEN VAN
9fe79edfd2
Merge "Remove IpClient usage of NetworkManagementService"
2019-01-29 08:58:32 +00:00
Remi NGUYEN VAN
249da094eb
Add utils connect, setsockopt, bind, sendTo
...
The utilities are not supported as public API but required as SystemApi
for the NetworkStack.
Test: flashed, boots, WiFi works
Bug: 112869080
Change-Id: Ia64b3bf9c6c33cf61bed76469ea9963b550bed2b
2019-01-29 17:49:36 +09:00
Remi NGUYEN VAN
5c5f1ba99c
Add NetworkUtils utilities to SystemApi
...
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.
Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
2019-01-29 17:30:26 +09:00
Remi NGUYEN VAN
1bbed8a3b8
Run IpClientLinkObserver on Binder thread
...
This restores previous behavior, where callbacks would not be called on
the IpClient handler thread.
Test: atest FrameworksNetTests NetworkStackTests
Test: flashed, WiFi works
Bug: 123062477
Change-Id: I3015566b0922d76ac7cf70579a1de3e033bf7b4a
2019-01-29 17:09:01 +09:00
Gnaneshwar Gatla
f0b1c48141
Merge "uce: Updating UCE API to accept ICC-ID."
...
am: d20bdb915a
Change-Id: I09c1bb2f89d2fe456c3547671d1d81731b130d28
2019-01-28 22:04:32 -08:00
Mathieu Chartier
ff52af9cdd
Merge "Disable view compilation for privileged apps"
...
am: 3c496729de
Change-Id: Ice8a1710b04f93036dcdc831402d8975528f3fc2
2019-01-28 22:00:08 -08:00
Kulwinder Singh
0e3645d84b
Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"
...
am: 23b144eb40
Change-Id: Ifce8f15e876694a35c0e0a31b05d8ea47c462628
2019-01-28 21:50:20 -08:00
Pengquan Meng
1b607c875f
Merge "new SystemAPI to getSimLocale"
...
am: 5cf41e47fe
Change-Id: I61c7c147efc223000a58ae003231f97756783076
2019-01-28 21:24:15 -08:00
Remi NGUYEN VAN
27ae908282
Merge "Add SocketUtils for NetworkStack"
...
am: cec60fa56a
Change-Id: I0db40afbf2de55d77d9d5493e556f499d2383f59
2019-01-28 21:19:36 -08:00
Colin Cross
0b7bfe4c3f
Merge "clang-format ManifestFixer_test.cpp"
...
am: 171c9cdc6a
Change-Id: Ia252884dd1ddb2d1aad7b9b881e1107aa8160122
2019-01-28 21:16:13 -08:00
Ruchi Kandoi
c538141c6d
Merge "Add Secure NFC functionality"
...
am: 3ffdb26aa8
Change-Id: Ic3131f8763d0e04e50a81652f6b0e08e48bd0f1e
2019-01-28 20:48:08 -08:00
Treehugger Robot
d20bdb915a
Merge "uce: Updating UCE API to accept ICC-ID."
2019-01-29 04:43:32 +00:00
Jack Yu
daae1f5265
Merge "Data profile refactoring"
...
am: b551d0d6d3
Change-Id: Ibb6374fab2282a5db6d4f931c53ce8a1a0811988
2019-01-28 20:43:20 -08:00
Amit Mahajan
4c12798e56
Merge "Add Emergency Number Test Mode"
...
am: 783400c390
Change-Id: I5c831c92ef0a24496f7aabc1d0a50a5ee493cb26
2019-01-28 20:36:15 -08:00
Nick Kralevich
c37cf98395
Merge "jni: more O_CLOEXECs"
...
am: 0bd511611e
Change-Id: Id9eabfa92a488dbf7a27108aff8101d602e1adc9
2019-01-28 20:31:59 -08:00
Mathieu Chartier
3c496729de
Merge "Disable view compilation for privileged apps"
2019-01-29 04:24:10 +00:00
Pavel Grafov
b478bb25ac
Merge "Whitelist packages from VPN lockdown."
...
am: 774c3ce152
Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4
2019-01-28 20:18:23 -08:00
Jordan Liu
aee66949ef
Merge "CallQuality is set to empty instead of null"
...
am: b3f282daa1
Change-Id: I57b228b8d8b2c42c8a23e33d4c1c18a94c838907
2019-01-28 20:14:51 -08:00
Amit Mahajan
888d87ac7a
Merge "Add Emergency Uniform Resource Number (URN)"
...
am: e01a358b5b
Change-Id: I0c9f4182f8255ba0a6eeac501834ff26837cd357
2019-01-28 19:57:11 -08:00
Nandana Dutt
bc960e3905
Merge "Remove DumpstateOptions"
...
am: 706b2d0e16
Change-Id: I4134f2cd095e8d91a7f4444030a4c1523adb5483
2019-01-28 19:51:36 -08:00
Treehugger Robot
23b144eb40
Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"
2019-01-29 03:51:11 +00:00
Orion Hodson
db28e6e8b1
Merge "startop: use static_lib dependency on libdexfile."
...
am: ff1aa4e49a
Change-Id: I943a8bbf6945cb156ecb202b4537dc75ba2f5cf5
2019-01-28 19:48:13 -08:00
Steven Moreland
9bb477afb6
Merge "framework.jar: Include all radio HIDL libs."
...
am: 3c7ac4e991
Change-Id: Ib45dc36987acd944f0abe9496b62701557d18e2e
2019-01-28 19:44:18 -08:00