Commit Graph

528824 Commits

Author SHA1 Message Date
Anton Hansson
4053ff88b5 Merge "Update test-current.txt with removed MP APIs" am: f5e95d6a5f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460267

Change-Id: I5afe51a1d9a43bb6a54942ea3f57534f423fed1e
2020-10-15 21:07:34 +00:00
Anton Hansson
f5e95d6a5f Merge "Update test-current.txt with removed MP APIs" 2020-10-15 20:19:14 +00:00
Treehugger Robot
b0089bdecf Merge "SystemUI: Relax AVC level requirement" am: 59379bb43a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456875

Change-Id: I0c73b557cf0253b7bd3f211fe7b89fddbfc69b66
2020-10-15 19:39:41 +00:00
Treehugger Robot
59379bb43a Merge "SystemUI: Relax AVC level requirement" 2020-10-15 19:13:11 +00:00
vichang
aef91d9f66 Merge "Allow the skeleton of "jmma" in DateFormat.getBestDateTimePattern()" am: be4e63522f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458400

Change-Id: I91abf415fab433aee6dfd94b8289f5ef459a8488
2020-10-15 19:08:43 +00:00
vichang
d4c2e18e32 Merge "Add owner file to unit test folder for android.text.format" am: c3d168cc98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460403

Change-Id: I7b4aa13b736e235f7c8dcbf4b362a6fcf83da263
2020-10-15 19:05:53 +00:00
vichang
be4e63522f Merge "Allow the skeleton of "jmma" in DateFormat.getBestDateTimePattern()" 2020-10-15 18:30:21 +00:00
vichang
c3d168cc98 Merge "Add owner file to unit test folder for android.text.format" 2020-10-15 18:28:11 +00:00
Victor Chang
92d7f16109 Add owner file to unit test folder for android.text.format
same owners as core/java/android/text/format/OWNERS

Test: treehugger
Change-Id: I98565ac6ece872804e7b9269096c8bcabc29e067
2020-10-15 18:27:53 +00:00
Treehugger Robot
ce94c11c87 Merge "Default compressed audio bytes per sample to 1" am: aa2884ac69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444316

Change-Id: I4acafbb6c49a9c694463ea7d3afb341e7d07a275
2020-10-15 17:56:44 +00:00
Treehugger Robot
aa2884ac69 Merge "Default compressed audio bytes per sample to 1" 2020-10-15 17:48:07 +00:00
Treehugger Robot
08a11ec1b5 Merge changes from topic "update_sysprop_api_txt" am: da2ce9eae8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1462123

Change-Id: Iba73c0dabf340b310b730734d930baa348d3ce74
2020-10-15 16:11:02 +00:00
Inseob Kim
cd68e11de7 Update sysprop_library API txt am: 419b49ade3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460965

Change-Id: Id82757549ef05c29c859d2bdfd649d34091d9041
2020-10-15 16:06:21 +00:00
Treehugger Robot
da2ce9eae8 Merge changes from topic "update_sysprop_api_txt"
* changes:
  Update API of sysprop_library to match current.txt
  Update sysprop_library API txt
2020-10-15 15:08:21 +00:00
Robert Chou
69d78722b5 Merge "Unregistering PackageMonitor only when has registered it" am: 132f17ca3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456123

Change-Id: I6fdb78c24cf3c09433a2b183dd74c25fd991ec4f
2020-10-15 12:50:05 +00:00
Mark Chien
84b074eef8 Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" am: 613e6e3e9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459887

Change-Id: I2874508c560cc31f99e88c02fd63995f62f86a2f
2020-10-15 12:46:39 +00:00
Mathew Inwood
ab5ea0c1c5 Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460404

Change-Id: I735c10c108f33ebb92448dc14bd79e6f4ef50ff5
2020-10-15 12:43:12 +00:00
Robert Chou
132f17ca3e Merge "Unregistering PackageMonitor only when has registered it" 2020-10-15 12:41:10 +00:00
Mark Chien
613e6e3e9a Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" 2020-10-15 12:07:19 +00:00
Mathew Inwood
c6b54a3a9c Merge "Add HIDDEN_API_POLICY to @TestApi.i" 2020-10-15 12:03:55 +00:00
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
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
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
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
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
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
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
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
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
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