Commit Graph

6285 Commits

Author SHA1 Message Date
Treehugger Robot
07fcb99b1f Merge "Regenerate API signature files to correct annotation order" 2019-11-01 13:16:51 +00:00
Paul Duffin
b4f078e2ea Regenerate API signature files to correct annotation order
This does not change the API in anyway other than to enforce a
consistent, sorted order for all annotations; sorted by qualified
name of the annotation.

A simple bug in metalava meant that annotations were not sorted on an
API item that had exactly two annotations in the source. Fixing the
bug forced the regeneration of the signature files.

Bug: 143556317
Test: m checkbuild

(cherry picked from commit 7ba7991568)

Change-Id: I27795de6a8c83e419cda8807b8551a13bec1db10
Merged-In: I0a3d967571bb2f796f65c96a9ce9121e3538bad9
2019-10-31 23:29:44 +00:00
Ruoyao Liu (刘若尧)
51038e8b3c Add API to set the sll_protocol on PacketSocket
Problem & Root cause:
the mInterfaceBroadcastAddr.sll_protocol is not assigned when the
interface initializes, sll_protocol is 0x0000 by default.
This causes packets to be filtered incorrectly in packet capture,
typically with tcpdump. The previous API is used by DhcpClient, causing
DHCP tx messages to not be recognized properly.

Background: inside the kernel packets carry both an ethertype metadata
(skb->protocol) and may also carry a real ethertype in the mac header.

Previously skb->protocol would be inherited from the socket either from
the protocol from socket() creation or from bind().  This was zero,
so skb->protocol would end up 0, even though the DHCP packets we actually
wrote would have the right on-the-wire ethertype populated in the bytes
passed to send().

As such DHCP packets would look correctly on the wire, but were lacking
the skb->protocol metadata to correctly tag them as IPv4.

This results in 'tc' and packet hooks potentially not triggering
correctly, and can thus result in tcpdump 'ipv4' filters discarding
these packets leading to confusing/erroneous tcpdump output.

In newer kernels (somewhere around 5.3), if socket protocol is 0, we
actually parse out the right ethertype from the mac header during send().

However, for old kernels we can't rely on this kernel magic, and the
right fix is simply to make sure that socket bound protocol is correctly
set to ipv4 [htons(ETH_P_IP)] in the bind() system call.

Solution:
  Add a new constructor in SocketUtils to set the protocol parameter.
Bug: 133196453
Test: manual test
Change-Id: I07887b82e0e32aadb0cbb9f930f2b2fa3e277ca9
2019-10-30 06:26:10 +00:00
Jordan Liu
09a3b50108 Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions"
am: 6af905e0fe

Change-Id: I166c9396c5b4d194cb2510a454005dc83b442247
2019-10-18 16:29:57 -07:00
Jordan Liu
7aea30267c [DO NOT MERGE] Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: I865c09d6d246779b706c06371df685d415618699
2019-10-18 14:20:50 -07:00
Hall Liu
d071c48af9 Merge "Add SDK compatibility code for new call states"
am: 22027a86e2

Change-Id: I3f1d667503cb406d04ad5910deb1177583243a36
2019-10-16 16:23:47 -07:00
Hall Liu
22027a86e2 Merge "Add SDK compatibility code for new call states" 2019-10-16 23:11:58 +00:00
Hall Liu
31de23da21 Add SDK compatibility code for new call states
Add code that translates the new call states to old call states for
in-call UIs that don't yet support background call screening.

Test: CTS
Bug: 140317205
Change-Id: I104f5f7ab3e3dc075e1d9ed5c64fcd924f9a977b
2019-10-11 17:59:42 -07:00
Jordan Liu
21fedfab99 Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a
2019-10-09 14:26:12 -07:00
Jordan Liu
656502be63 [DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"
This reverts commit b59c74f302.

Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383)

Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
2019-10-09 13:34:26 -07:00
Jordan Liu
a2ca902d2f Merge "Add CellBroadcastService and related permissions"
am: 32382561a6

Change-Id: I158509f8c22b1ea5780d9dcae126f4bf32184564
2019-10-09 09:26:01 -07:00
Jordan Liu
b59c74f302 Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
Merged-In: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-08 11:20:46 -07:00
Shuo Qian
05430c9d1f Merge "Change the Listener API names"
am: fe6978a73f

Change-Id: Icf860de451298632635ad15ba0d1c7701b83073e
2019-10-04 19:41:12 -07:00
Shuo Qian
d96637660f Change the Listener API names
Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
2019-10-04 13:24:23 -07:00
Shuo Qian
69eabb2397 Merge "Add both Emergency Number listener for testing"
am: 46cf71d1d0

Change-Id: I0973225c5125e0549757f609d52f58031e447f5d
2019-10-04 09:10:35 -07:00
Shuo Qian
650ff647e4 Add both Emergency Number listener for testing
Test: CTS
Bug: 135204580
Change-Id: Ifb20b9a20f9493fb7fe671c0fd2d8b4de7ea9f67
2019-10-03 15:09:00 -07:00
Hall Liu
a49ac76b93 Merge "Add APIs to support background call screening"
am: 360428c44a

Change-Id: If443843db03da5013ea9938b1e81e430fee0f182
2019-10-02 13:38:59 -07:00
Hall Liu
360428c44a Merge "Add APIs to support background call screening" 2019-10-02 18:34:54 +00:00
Hall Liu
6dfa249c88 Add APIs to support background call screening
Add Telecom APIs and AIDL code.

Test: CTS
Bug: 140317205
Change-Id: I99970f5ce12442f307a656db76cb26f5101e6c7f
2019-10-01 17:40:32 -07:00
Brad Ebinger
05e03e8c0c Merge "Add Telecom command for setting connectionservice filter"
am: 25f4dca660

Change-Id: I00ba7ce3b64f4680eaf8798c52d98318160b45f0
2019-10-01 10:51:45 -07:00
Brad Ebinger
a9a33e1d68 Add Telecom command for setting connectionservice filter
For testing we need the emergency call to go through the CTS
ConnectionService. This is achieved by passing in a package
name filter for testing, which restricts which ConnectionServices
are available for emergency calling.

For safety this filter will be bypassed if the user calls an
actual emergency number (instead of a test number).

Bug: 138741228
Test: atest CtsTelecomTestCases
Change-Id: I656533e4a36a7bba48625bf6f763731991695aed
2019-09-30 17:46:36 -07:00
Brad Ebinger
64418f4c31 Merge "Integrate the active emergency session listener in TelephonyRegistry"
am: 4a54c2fa2b

Change-Id: I890a913c18332669dee8f21baf81db78a50a0fb0
2019-09-30 16:08:04 -07:00
Shuo Qian
b61230c51d Integrate the active emergency session listener in TelephonyRegistry
Add Telecom shell command: "adb shell telecom set-system-dialer"

Test: PhoneStateListener cts
Bug: 135204580
Merged-In: I5eaada6a671606642a849f0ff6fe964332d80d5f
Change-Id: I5eaada6a671606642a849f0ff6fe964332d80d5f
2019-09-30 20:43:42 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Jeff Sharkey
9f6f8bedbc Wait until any background events are processed.
Some MediaProvider events (such as thumbnail invalidation) are
handled on a background thread.  To reduce flaky tests, wait until
all background events have been processed, which is more robust
than sleep.

Bug: 134879702
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ia032b19c1b0e5c0096c55bf3d46a5153525e89fa
(cherry picked from commit efad242f35)
2019-08-19 22:15:51 +00:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Taesu Lee
b89c2984bb Added the min match system config for loose phone numbers comparison
Specific min match is required for each country.

Test: atest PhoneNumberUtilsTest

Change-Id: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Merged-In: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Bug:134246556
(cherry picked from commit d65aafc748)
2019-08-05 23:45:37 +00:00
Taesu Lee
7cd93b77d6 Merge "Added the min match system config for loose phone numbers comparison" into qt-dev-plus-aosp
am: 41f788ca29

Change-Id: I41506717c3b684b9ad81858ab9da13109a5a3504
2019-08-04 00:52:19 -07:00
Taesu Lee
d65aafc748 Added the min match system config for loose phone numbers comparison
Specific min match is required for each country.

Test: atest PhoneNumberUtilsTest

Change-Id: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Merged-In: I7f9e9ad824d44f2ebf8367beb6ec337e3eb3a8ad
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Bug:134246556
2019-07-18 14:10:58 -07:00
Adrian Roos
56b89eff84 Merge "AM: make isHighEndGfx TestApi" into qt-dev am: 2ac934280c
am: 1b027edda1

Change-Id: I2ac2395e2c2814285e940f937c80f641fac31e44
2019-07-16 09:41:21 -07:00
Adrian Roos
1b027edda1 Merge "AM: make isHighEndGfx TestApi" into qt-dev
am: 2ac934280c

Change-Id: Ib531628ddd2fe1f4f5231f3892740b5dcbcfaf0d
2019-07-16 09:30:05 -07:00
Adrian Roos
5af40871ea AM: make isHighEndGfx TestApi
Bug: 136784434
Test: n/a
Change-Id: Ie26de8dcf64a02b7757d4f705485cdcb7470f511
2019-07-15 12:05:54 +02:00
Adrian Roos
ace63f135b Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev am: 8ef731c232
am: bee24f79f7

Change-Id: Ic14aaff3851fe0d71100c6f65c8ee46d08ece432
2019-07-04 08:21:20 -07:00
Adrian Roos
bee24f79f7 Merge "WM: implicitly exclude all edges for pre-Q immersive sticky apps" into qt-dev
am: 8ef731c232

Change-Id: Ie23184e62d410cff170232d15720b22d53f7e6df
2019-07-04 08:07:23 -07:00
Adrian Roos
019a52b4ad WM: implicitly exclude all edges for pre-Q immersive sticky apps
Bug: 135522625
Test: atest DisplayContentTests
Change-Id: Ibe6c2c6d269b15c2e79ac0241b93e42c44a167c9
Exempt-From-Owner-Approval: TBR
2019-07-04 14:35:34 +00:00
Jorim Jaggi
52ba8df055 Merge "GestureNav: Limit exclusion rects" into qt-dev am: ea3216d462
am: de8014e068

Change-Id: Ibaa2b5dbe34ed53f3c64feca4d71dfa43b6d5f44
2019-06-28 08:53:29 -07:00
Jorim Jaggi
de8014e068 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Id52bcbd80028ce0030b7f8b38058e7a786744497
2019-06-28 07:48:06 -07:00
Adrian Roos
506267d5f4 GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.

Bug: 135522625
Test: atest SystemGestureExclusionRectsTest

Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
2019-06-28 17:59:06 +08:00
lumark
5df8aa8ee8 Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev am: b7abebde5b
am: c0ecccca16

Change-Id: Iaf173a4f4f1ddd89421ab14f38c44639b1cc2726
2019-06-18 05:45:49 -07:00
lumark
cf48a8e828 Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev
am: b7abebde5b

Change-Id: I2224102556d110021150ddb6eea90bb0be2c2f36
2019-06-18 05:32:30 -07:00
lumark
c0ecccca16 Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev
am: b7abebde5b

Change-Id: I7459ec72287ffa36bcc11e9cce87d9a4258705d5
2019-06-18 05:32:28 -07:00
lumark
ca442d5d9f Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable.
Annotates InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED as @TestApi
to let cts can verify if multi-client IME enabled.

Bug: 135217809
Test: build and passes
Change-Id: Id7b4dceb2dbfaf3d7ed1084957dd14b04cad0cdf
2019-06-17 16:09:42 +08:00
Winson
02c612552f Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev am: d703395fcb
am: 7347c0f704

Change-Id: If3f0a0e539ced53c291b67b2a750004583f26840
2019-06-10 13:28:35 -07:00
Winson
5d53d4b564 Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev
am: d703395fcb

Change-Id: I10e09a0bc15d9f4782ac9d91878becb9046581c3
2019-06-10 13:22:46 -07:00
Winson
7347c0f704 Merge "Expose PermissionManager as TestApi and fix SplitPermissionInfo equality" into qt-dev
am: d703395fcb

Change-Id: Id965c774d70ad823de8f32d0e63b6d0ce0471754
2019-06-10 13:22:40 -07:00
Winson
f27394ee70 Expose PermissionManager as TestApi and fix SplitPermissionInfo equality
Bug: 129200416
Bug: 129200610

Test: atest SplitPermissionsTest

Change-Id: I98795944e6440e5b7ebba134bd7735a6f78ebc4f
2019-06-07 15:09:06 -07:00
PO HUNG CHEN
5b95289b71 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev am: 4f179bb174
am: e743aeb922

Change-Id: Ice5fc23658245af695a38ac8aebfa5230ebc138c
2019-05-28 19:21:09 -07:00
PO HUNG CHEN
e743aeb922 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev
am: 4f179bb174

Change-Id: Ic8177c57829e8f28b881c3347b1a4b93084c7fe4
2019-05-28 19:16:26 -07:00
PO HUNG CHEN
a3204b25e9 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev
am: 4f179bb174

Change-Id: I5290b5d51dd98eecaa97c87eec1dc8780d1f537a
2019-05-28 19:16:20 -07:00
PO HUNG CHEN
4f179bb174 Merge "Fix StrictModeTest#testNonSdkApiUsage" into qt-dev 2019-05-29 02:07:06 +00:00