Commit Graph

6009 Commits

Author SHA1 Message Date
Jeff Sharkey
358f0d4fc8 Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3
2020-12-08 16:43:19 +00:00
Jeff Sharkey
9af6ac78b0 Merge changes from topic "dec5" am: c2793cf12b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdc390f5ae046c515a30158f3f55b831be147547
2020-12-08 16:05:11 +00:00
Jeff Sharkey
52b9862f87 Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script that
identifies relevant "include" directives.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-08 08:36:28 -07:00
Xin Li
8836e88707 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I26bed08456197721d07f2fab563be0c54e43efd2
Change-Id: Ic1ac100efa50687ccfcbb87ee91a57703105afad
2020-12-07 00:39:42 -08:00
Xin Li
d31ee38811 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
2020-12-02 00:38:58 -08:00
Songchun Fan
59e16410cc Merge "[DeviceConfig] add schfan to OWNERS" am: 12fc9f58a4 am: 0aec249264 am: 92babaa746
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503393

Change-Id: Iddf5d4c50c2da392e63eb84627525936346b273b
2020-11-18 23:42:20 +00:00
Songchun Fan
92babaa746 Merge "[DeviceConfig] add schfan to OWNERS" am: 12fc9f58a4 am: 0aec249264
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503393

Change-Id: I5c5525cc6efee1bb9c858375c0d30ee3b79ba5d5
2020-11-18 23:35:52 +00:00
Songchun Fan
84c340e6ab [DeviceConfig] add schfan to OWNERS
Test: N/A
Change-Id: I851d3925fa328d06f8165f9da9b367221b734fac
2020-11-18 23:12:02 +00:00
Mathew Inwood
5a448e27ed Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1
2020-11-09 15:24:20 +00:00
Mathew Inwood
f8abe13db4 Merge "Add maxTargetSdk restriction to unused APIs." 2020-11-09 14:41:20 +00:00
Grace Jia
1628da1ed5 Merge "Add missed information relative parameter and fields." am: 3014218c9e am: 25c392d7a1 am: e776e16151
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1167604

Change-Id: I9bbc329c80183fb93c604e05d9ea975a2cc5a3d4
2020-11-04 22:41:15 +00:00
Grace Jia
e776e16151 Merge "Add missed information relative parameter and fields." am: 3014218c9e am: 25c392d7a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1167604

Change-Id: I634bbe43e14aef85a487681112f954a84075ca06
2020-11-04 22:09:44 +00:00
Grace Jia
3014218c9e Merge "Add missed information relative parameter and fields." 2020-11-04 21:16:48 +00:00
Mathew Inwood
5d123b6775 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
2020-11-04 09:45:53 +00:00
Yi Kong
475fb2a707 Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" am: c4aedd1f87 am: 02709d5394 am: d2b9bd8405
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471526

Change-Id: I8fd2dd7166b12f80135a949c187f6298ca01e701
2020-11-03 01:58:06 +00:00
Yi Kong
d2b9bd8405 Merge "Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments" am: c4aedd1f87 am: 02709d5394
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471526

Change-Id: Ica83c944d645c9d1f23e5ba825e85491405bfc16
2020-11-03 01:41:59 +00:00
Grace Jia
3280596f6e Add missed information relative parameter and fields.
Test: android.provider.cts.CallLogTest
Bug: 144452099
Change-Id: Idb5fb877a5e947b00ae1d7d4046f0bef26af8550
2020-11-02 18:09:01 +00:00
Yi Kong
878268ceab Add NAMESPACE_PROFCOLLECT_NATIVE_BOOT for profcollect feature experiments
Bug: 79161490
Test: build
Change-Id: Icf8c24f6d5b63a28272e383e5ab0641032710cdd
2020-11-03 00:48:10 +08:00
Mathew Inwood
5f0edaaaf5 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7
Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
2020-11-02 10:30:09 +00:00
Anton Hansson
24b4d166dd Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
2020-10-20 20:31:58 +00:00
Anton Hansson
14897c256d Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
2020-10-20 19:45:04 +00:00
Anton Hansson
d2d4637685 Merge "Remove @TestApi from @SystemApi symbols" 2020-10-20 13:45:13 +00:00
Anton Hansson
dd7d52f963 Remove @TestApi from @SystemApi symbols
I ran these commands:
    cd frameworks/base
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'

Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
2020-10-19 16:41:01 +01:00
Mathew Inwood
8147357dac Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a9c am: ab5ea0c1c5 am: 4c1da9c0df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460404

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

Change-Id: I4cb38bce944212ee3487279a01934009bc7ba418
2020-10-15 13:15:30 +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
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
b8ee20c988 Merge "Rememeber the last dark mode before shutdown when in auto mode" into rvc-qpr-dev am: 9be043388a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12819439

Change-Id: I97a361d1f6e43f82ee2f560f91b7e7a1344234a7
2020-10-13 15:08:13 +00:00
Abhijeet Kaur
0b4cd450af Validate user-supplied tree URIs in DocumentsProvider calls
Currently we only validate DocumentsContract.EXTRA_URI, this change
validates other URIs suchs as DocumentsContract.EXTRA_TARGET_URI and
DocumentsContract.EXTRA_PARENT_URI as well

Bug: 157320716
Test: Manually using the test app in b/157320716#comment1
Change-Id: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
Merged-In: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
(cherry picked from commit b9f4fb7928)
(cherry picked from commit eca247f2d3)
2020-10-13 01:07:13 +00:00
Abhijeet Kaur
cdb913418a Validate user-supplied URIs in DocumentsProvider calls
Some URIs are used without validating their authorities which can lead
to exploitation by malicious apps.

Bug: 157294893
Test: Manual using test app in b/157294893
Change-Id: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f
Merged-In: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f
(cherry picked from commit 75f984bd32)
(cherry picked from commit e4bb1d7b6c)
2020-10-13 01:07:05 +00:00
Jay Aliomer
e81d5f6312 Rememeber the last dark mode before shutdown when in auto mode
Twilight mode is not available when the phone starts. So the last state
is rememebered until the phone screen turns off

Fixes: 160842085
Test: manual testing
Merged-In: I78a490c0f083e92022e1995b3e19dc7dd567a7c3
Change-Id: I78a490c0f083e92022e1995b3e19dc7dd567a7c3
(cherry picked from commit 7bddda48fc)
2020-10-12 20:51:01 +00:00
Xin Li
986e6eeddf Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Abhijeet Kaur
22a3dede66 Validate user-supplied tree URIs in DocumentsProvider calls am: eca247f2d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513169

Change-Id: Ibc90fe5e176678bf3a10e5a876e3a5da772302ee
2020-10-06 14:00:53 +00:00
Abhijeet Kaur
eca247f2d3 Validate user-supplied tree URIs in DocumentsProvider calls
Currently we only validate DocumentsContract.EXTRA_URI, this change
validates other URIs suchs as DocumentsContract.EXTRA_TARGET_URI and
DocumentsContract.EXTRA_PARENT_URI as well

Bug: 157320716
Test: Manually using the test app in b/157320716#comment1
Change-Id: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
Merged-In: I90fd1e62aa7dc333bf32eb80ccc5b181a1d54e41
(cherry picked from commit b9f4fb7928)
2020-10-06 12:12:35 +00:00
Abhijeet Kaur
1507e59477 Merge "Validate user-supplied URIs in DocumentsProvider calls" into rvc-qpr-dev am: 249b137d92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515255

Change-Id: If6eace10dd76208e82070409a45f3643229d6bb3
2020-10-06 10:53:39 +00:00
Abhijeet Kaur
249b137d92 Merge "Validate user-supplied URIs in DocumentsProvider calls" into rvc-qpr-dev 2020-10-06 10:17:23 +00:00
Govinda Wasserman
6e8d9e5cb6 Merge "Adds Assistant Handles learning state to backed up settings" into rvc-qpr-dev am: 01c000eff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12656264

Change-Id: Id9a1336991a0745f62b33c85250c45cc0f66b4b9
2020-09-23 17:41:15 +00:00
Govinda Wasserman
6c6e754f63 Adds Assistant Handles learning state to backed up settings
This solves the issue where the device would forget the learned state
when restoring from a backup.

Test: Tested locally
BUG: 159807978
FIX: 159807978
Change-Id: Ia1d5926621c4b45402036aaf06cbab19c12869bd
Merged-In: Ia1d5926621c4b45402036aaf06cbab19c12869bd
2020-09-23 02:18:28 +00:00
Amit Mahajan
4f59bdded5 Data connection for carrier specific APN
Implement the following features to support carrier network connection.
This commit is to define the carrier config for each features.

1. Sets default preferred APN
2. Uses dun APN when using Preset APN in roaming network

Also, fixed that to use only APNs with the same set id as preferred
APN.

Test: Manual
Bug: 147969062
Merged-in: If1e6d2bf58de39c22caa901fcd90fb11f104d900
Change-Id: If1e6d2bf58de39c22caa901fcd90fb11f104d900
(cherry picked from commit b9beb0d1afda6327b1c7645ac20a016f08e5744e)
2020-09-18 22:34:52 +00:00
Amit Mahajan
e662938fdf Merge "Data connection for carrier specific APN" into rvc-d1-dev-plus-aosp am: e2b212e94e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12624999

Change-Id: Id017dddb5ff8f10d8bacf9e55a8dbca515309a0f
2020-09-18 08:54:24 +00:00
Masaho Nishikawa
52052c8147 Data connection for carrier specific APN
Implement the following features to support carrier network connection.
This commit is to define the carrier config for each features.

1. Sets default preferred APN
2. Uses dun APN when using Preset APN in roaming network

Also, fixed that to use only APNs with the same set id as preferred
APN.

Test: Manual
Bug: 147969062
Merged-in: If1e6d2bf58de39c22caa901fcd90fb11f104d900
Change-Id: If1e6d2bf58de39c22caa901fcd90fb11f104d900
2020-09-18 07:36:28 +00:00
Beth Thibodeau
48f5f05e91 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming" am: f715910293
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12597796

Change-Id: Ib12f9d769f6273849216678f7749c72172f3e179
2020-09-17 19:12:14 +00:00
Beth Thibodeau
f715910293 [DO NOT MERGE] Revert "Allow user to block individual apps from resuming"
Revert "Allow user to block individual apps from resuming."

Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2

Bug: 161813143

Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming

Change-Id: I888079abc77f5bc22aefa19c2f7523bb9db05bf8
2020-09-17 17:56:11 +00:00
Masaho Nishikawa
115e02818a Data connection for carrier specific APN
Implement the following features to support carrier network connection.
This commit is to define the carrier config for each features.

1. Sets default preferred APN
2. Uses dun APN when using Preset APN in roaming network

Also, fixed that to use only APNs with the same set id as preferred
APN.

Test: Manual
Bug: 147969062
Change-Id: If1e6d2bf58de39c22caa901fcd90fb11f104d900
(cherry picked from commit b9beb0d1afda6327b1c7645ac20a016f08e5744e)
2020-09-16 22:52:49 -07:00
Jeff Sharkey
487d394296 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
2020-09-15 00:13:08 +00:00
Jeff Sharkey
da7478b570 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c
2020-09-14 23:42:34 +00:00
Jeff Sharkey
741c0a78cc Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
2020-09-14 23:10:42 +00:00
Jeff Sharkey
6516a83886 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ifce5239991e3b78dd4757712e3b88093ad7161f0
2020-09-14 10:00:02 -06:00
Jeff Sharkey
705f6bec2d Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e
2020-09-14 09:59:01 -06:00
Abhijeet Kaur
e4bb1d7b6c Validate user-supplied URIs in DocumentsProvider calls
Some URIs are used without validating their authorities which can lead
to exploitation by malicious apps.

Bug: 157294893
Test: Manual using test app in b/157294893
Change-Id: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f
Merged-In: I799509ed5ff7e69140e84d796fe7f96d9dbfd32f
(cherry picked from commit 75f984bd32)
2020-09-07 12:51:00 +00:00