Commit Graph

530366 Commits

Author SHA1 Message Date
Anton Hansson
b2442b9036 Merge "Remove Tethering @TestApi" am: bd175573a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522

Change-Id: I3dcf776384d6c53876acaeb344820a88c19027da
2020-10-15 11:11:02 +00:00
Treehugger Robot
f88f3c9f08 Merge "Add imports to networking test mapping" am: f184d40178
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2
2020-10-15 11:07:41 +00:00
Anton Hansson
bd175573a5 Merge "Remove Tethering @TestApi" 2020-10-15 10:39:14 +00:00
Woody Lin
36a6eb1930 Update API of sysprop_library to match current.txt
The current.txt is updated by:
m com.android.sysprop.watchdog-dump-api && \
    rm -rf frameworks/base/core/sysprop/api/com.android.sysprop.watchdog-current.txt && \
    cp -f out/soong/.intermediates/frameworks/base/core/sysprop/com.android.sysprop.watchdog_sysprop_library/api-dump.txt \
    frameworks/base/core/sysprop/api/com.android.sysprop.watchdog-current.txt

Bug: 170935569
Test: m
Change-Id: Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098
Merged-In: Ie6d6ff5ed6c3883cb3459b8fb57ca18f4ce28098
(cherry picked from commit 032f11ee7f)
2020-10-15 10:38:48 +00:00
Inseob Kim
419b49ade3 Update sysprop_library API txt
Internal props are no longer stored in the txt file.

Bug: 170693240
Test: m
Change-Id: I698b55d7b22afed71c94ee18fe76f409abc18baa
Merged-In: I698b55d7b22afed71c94ee18fe76f409abc18baa
2020-10-15 10:38:36 +00:00
Treehugger Robot
f184d40178 Merge "Add imports to networking test mapping" 2020-10-15 10:21:25 +00:00
Remi NGUYEN VAN
4ea8a1fbae Add imports to networking test mapping
Ensure that appropriate networking tests are triggered when submitting
changes in the frameworks/base directories.

Change-Id: Ibf8b567fa7721299120b0a6c6836dd770d92a9fc
Test: treehugger runs TEST_MAPPING tests
2020-10-15 09:16:40 +00:00
markchien
5c7d8e5313 Fix miss tracking downstream problem in PrivateAddressCoordinator
The downstream do not be tracked if PrivateAddressCoordinator just
return cached address. Then, PrivateAddressCoordinator would not notify
that downstream if conflict happen.

Also remove the null check in getDownstreamPrefix because:
- An IpServer is only added to mDownstreams by requestDownstreamAddress.
- That method will only add the IpServer to mDownstreams if it has an
IPv4 address.
- As soon as that method returns, the IpServer sets mIpv4Address to the
address that was returned.
- When an IpServer is torn down, mIpv4Address is set to null after
releaseDownstream is called.

So it should never be possible for this to return null.

Bug: 168169687
Test: atest CtsTetheringTest
      atest TetheringTests
Change-Id: Ide5206b013acdc499344e1c839a830c5b245af41
2020-10-15 16:21:12 +08:00
Woody Lin
6c1e2dd193 Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4c3 am: 2b2066096b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316216

Change-Id: I6cc7d4aac462af6bff8703300fc035a161a7c7ba
2020-10-15 07:50:56 +00:00
Woody Lin
2b2066096b Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316216

Change-Id: I4882c0f7ea80efbba52514cdc9e13e627a735dfd
2020-10-15 07:28:53 +00:00
Woody Lin
16402fc4c3 Merge "Watchdog: break timeout loop via system fatal crash" 2020-10-15 06:44:52 +00:00
Siarhei Vishniakou
aa5360b66e Merge "Avoid MotionEvent no finish raise unnecessary ANR" am: 0749905967 am: 036d89cd7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459888

Change-Id: I3b3bb881ee2a73bd07cc96574e045582cb1f7d4d
2020-10-14 23:15:37 +00:00
Siarhei Vishniakou
036d89cd7d Merge "Avoid MotionEvent no finish raise unnecessary ANR" am: 0749905967
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459888

Change-Id: If0eafb434e3226a2cf2727fdd7111b7b582e6fa3
2020-10-14 22:49:50 +00:00
Siarhei Vishniakou
0749905967 Merge "Avoid MotionEvent no finish raise unnecessary ANR" 2020-10-14 22:17:19 +00:00
Mark Goldstein
18d9527af6 Doc: Fix typo the right way. Supersedes cl/318172931 am: d5726423ca am: 0e59503e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12828332

Change-Id: Ifd5624dcef44f9b1e65f763d732846f345c32e10
2020-10-14 22:00:34 +00:00
Ryan Mitchell
70e02d4285 Fix <overlay-config-signature> comments
Fix comments that refer to <overlay-config-signature> as
<config-signature>.

Bug: none
Test: build
Change-Id: I1d3e5e66ec3da993082f3441997b0d243d61520b
2020-10-14 14:53:01 -07:00
Ryan Mitchell
7d0ccc133b Fix non-inclusive OMS test language
Bug: 162729394
Test: atest .
Change-Id: I86b869af11c0d70bbb2aeaaa85d5c1eb83fc2e3a
2020-10-14 14:52:57 -07:00
Ryan Mitchell
bf1f45b071 Remove malloc/free for inline overlay values
Remove malloc/free of android::ResTable_entry for inline overlay
values.

Add `target_entry_inline` to the idmap format to encode inline overlay
values separate from direct mapping of target resource to overlay
resource. This reduces the number of bytes needed to represent a direct
mapping of target resource to overlay resource from 9 bytes to 8 bytes
per entry.

Fixed all idmap alignment issues that required the framework to use
"#pragma pack(push, 1)" when loading idmaps.

Bug: 170341022
Test: idmap2_tests and libandroidfw_tests
Change-Id: Iab4d3902508f02773464724913e0ee966e3689e4
2020-10-14 14:52:52 -07:00
Zoran Jovanovic
0f942f99ca OMS: Add config_signature policy handling
Alongside SIGNATURE and ACTOR_SIGNATURE policies, add CONFIG_SIGNATURE
policy to overlayable that overlay fulfills if it is signed with the
same certificate as the reference package whose package name is
declared in 'config-signature' tag of SystemConfig and is vetted by
OMS that it's a system pre-installed package.

BUG: 158726924
TEST: regular aapt2, idmap2, OMS tests

Merged-In: I645ee72271496008742886274be0d63a2985201b
Change-Id: I645ee72271496008742886274be0d63a2985201b
2020-10-14 14:52:46 -07:00
Philip P. Moltmann
ea66dd6ca5 Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d576 am: ad9467332c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1339995

Change-Id: Icad186f7a973ebf08a7b506561573a963d762d49
2020-10-14 21:42:28 +00:00
Mark Goldstein
0e59503e96 Doc: Fix typo the right way. Supersedes cl/318172931 am: d5726423ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12828332

Change-Id: Idfff776666d9175a45cea54996d61919f7df3057
2020-10-14 21:41:47 +00:00
Philip P. Moltmann
ad9467332c Merge "fix broadcast receivers overflow for system_server" am: 9ba1a0d576
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1339995

Change-Id: I21973fa539299a967dc78161a57fa467a99912c3
2020-10-14 21:14:15 +00:00
Philip P. Moltmann
9ba1a0d576 Merge "fix broadcast receivers overflow for system_server" 2020-10-14 20:55:14 +00:00
Mark Goldstein
d5726423ca Doc: Fix typo the right way. Supersedes cl/318172931
Bug: 170764224

Change-Id: Iaef1aa4fd3143e6e9019d06834001b3bfa3d887d

Exempt-from-owner-approval: Docs-only typo fix
2020-10-14 20:38:09 +00:00
Brad Ebinger
b7fd7db377 Merge "MMS APIs rely on resolveSubscriptionForOperation()" am: e0ae42884d am: 12d3218ef3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456127

Change-Id: I8f6c6fca2d3d980f0fbd08d3a3b9fefa8b2393ed
2020-10-14 19:26:12 +00:00
Brad Ebinger
12d3218ef3 Merge "MMS APIs rely on resolveSubscriptionForOperation()" am: e0ae42884d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456127

Change-Id: If53101e6ffb038885ff2602c169bef0e4b7e8d2e
2020-10-14 18:44:44 +00:00
Brad Ebinger
e0ae42884d Merge "MMS APIs rely on resolveSubscriptionForOperation()" 2020-10-14 18:28:48 +00:00
Shuo Qian
4e847577d3 Merge "Use TelephonyManager#isEmergencyNumber() instead" am: 1963c4b1c6 am: e931ca461e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454556

Change-Id: I1e36efb6b69535e2d3afc0e5b5650b372d9bd1a1
2020-10-14 18:22:28 +00:00
Shuo Qian
e931ca461e Merge "Use TelephonyManager#isEmergencyNumber() instead" am: 1963c4b1c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454556

Change-Id: I13b1f71733c3f4ead6878331e3cc3609bcc4f013
2020-10-14 17:58:14 +00:00
Shuo Qian
1963c4b1c6 Merge "Use TelephonyManager#isEmergencyNumber() instead" 2020-10-14 17:41:18 +00:00
Anton Hansson
961bddd3f8 Merge "Have test_current be a union of system and test APIs" am: ae26decc8e am: e25f19221f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457759

Change-Id: If85e19bdb4878bbedfa5828a9c73255ec19b5e5d
2020-10-14 16:19:55 +00:00
Anton Hansson
e25f19221f Merge "Have test_current be a union of system and test APIs" am: ae26decc8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457759

Change-Id: Ie7fcc420f2a050b42b60ed2387c7552327624066
2020-10-14 15:15:49 +00:00
Anton Hansson
b79038389d Update test-current.txt with removed MP APIs
Bug: 170395679
Test: m checkapi
Change-Id: Ie81a2ef5dc6d2ba001ae87ad0cba99b4c1eede1c
Merged-In: Ie81a2ef5dc6d2ba001ae87ad0cba99b4c1eede1c
(cherry picked from commit 8c59eab6ade8b465ed5a23adf7316783469ef122)
2020-10-14 16:04:23 +01:00
Anton Hansson
7fb5a029e4 Remove Tethering @TestApi
Modules shouldn't have TestApis, as documented in go/android-api-types.
Additionally, nothing depends on these TestApis existing.

Bug: 170395679
Test: m checkapi
Change-Id: I6e2c8298e90b4b54f0264be974d036fa08cd5632
Merged-In: I6e2c8298e90b4b54f0264be974d036fa08cd5632
2020-10-14 16:03:57 +01:00
Anton Hansson
ae26decc8e Merge "Have test_current be a union of system and test APIs" 2020-10-14 14:43:03 +00:00
Treehugger Robot
f2c0479945 Merge "Test conflict notification work when using cached address" am: b7aee190a5 am: 3420af35ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889

Change-Id: I3f7f1fe42ed92147e5809d48ae5f38745fd71689
2020-10-14 14:34:43 +00:00
Mathew Inwood
bb935c1c24 Add HIDDEN_API_POLICY to @TestApi.i
This is a cherry-pick from internal master.

Test: cd cts/tests/signature; atest
Bug: 170428909
Bug: 169987505
Merged-In: I68231850a000243cd01ba066585322cab7608884
Change-Id: I68231850a000243cd01ba066585322cab7608884
2020-10-14 13:57:55 +00:00
Treehugger Robot
3420af35ce Merge "Test conflict notification work when using cached address" am: b7aee190a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889

Change-Id: Ib9be992d5728346f063cea6ebc67b11a209e04c4
2020-10-14 13:34:06 +00:00
Treehugger Robot
b7aee190a5 Merge "Test conflict notification work when using cached address" 2020-10-14 13:18:58 +00:00
Victor Chang
02d0c76bc6 Allow the skeleton of "jmma" in DateFormat.getBestDateTimePattern()
'a' and 'j' specify the intent to use 12-hour format,
and the locale default 12-hour format, and they shouldn't be used
in the same skeleton, because they contradict to each other.

A skeleton, e.g. "jmma", is mapped into "ahmma" internally
by #mapSkeletonMetacharacters, and thus the internal skeleton
has duplicated fields "a".

This is a regression when we moved the implementation of
android.text.format.DateFormat#getBestPattern() from
udatpg_getBestPattern in ICU4C to ICU4j DateTimePatternGenerator
in the CL https://r.android.com/1355735.
The expected pattern generated from skeleton of "jmma" is
"h:mm a".

Bug: 170233598
Test: DateFormatTest
Change-Id: I13929f4b5bc66aaa90e0cef666cf52d7c32122ac
2020-10-14 14:10:01 +01:00
Anton Hansson
cbeab42fd6 Merge "Remove removed-dex-api generation" am: 83d9ddc6cb am: 4f3d7a966f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457761

Change-Id: I8773e2c93d04141e488d118e6fdc16f2f52147b4
2020-10-14 12:28:25 +00:00
Anton Hansson
4f3d7a966f Merge "Remove removed-dex-api generation" am: 83d9ddc6cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457761

Change-Id: I726fc30f57f3ac71987b459f71fd20ae9a18a475
2020-10-14 12:09:39 +00:00
Treehugger Robot
9ed7a74518 [automerger skipped] Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd45c am: 2099fa5a9d -s ours
am skip reason: Change-Id Ie85a347216614b7873bfdf199165d89527ada3a8 with SHA-1 9226fc3723 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459886

Change-Id: Ieca462d23bf4c023b5b61752ee57320cede0859b
2020-10-14 11:55:25 +00:00
Treehugger Robot
9b1db6b4db Merge "Fix a typo in a comment" am: 0e10d126a3 am: bcc6e4f4e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07
2020-10-14 11:54:57 +00:00
Anton Hansson
83d9ddc6cb Merge "Remove removed-dex-api generation" 2020-10-14 11:48:56 +00:00
Treehugger Robot
2099fa5a9d Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd45c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459886

Change-Id: I820a681ee427b485d403939d023a1f6387d52ba6
2020-10-14 11:26:40 +00:00
Treehugger Robot
bcc6e4f4e6 Merge "Fix a typo in a comment" am: 0e10d126a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I9174acc91209d83526901587bf4603d61aa30acc
2020-10-14 11:24:43 +00:00
Treehugger Robot
59ce8cd45c Merge "Fix storing the wrong value of mLockdown in setting" 2020-10-14 10:57:44 +00:00
Treehugger Robot
0e10d126a3 Merge "Fix a typo in a comment" 2020-10-14 10:54:25 +00:00
markchien
7d5c2cf25a Test conflict notification work when using cached address
This test catch the regression introduced in r.android.com/1432958.

Bug: 1432958
Test: atest TetheringTest

Change-Id: Id0c1afb5563954ffee1f598a3a5de6a245d77a0e
2020-10-14 17:02:29 +08:00