Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
563,049 Commits 3 Branches 0 Tags
e6a446b45fe257511764b6b39dfd0d129cb77a69
Commit Graph

6029 Commits

Author SHA1 Message Date
Andrei-Valentin Onea
dd1d1cbacc Merge changes from topic "preinstall-overrides" am: 29ed176b46 am: d1ebbf5086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94c9aca60ff8d5eec190434a2a22338cb04d5922
 2021-01-07 17:35:17 +00:00
Varun Shah
3e81038837 DO NOT MERGE: Disable StrictMode VM Policy check. am: f20d333ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13286399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7276ffe8b50b5668cf21166a9ff9fad725d6fc6a
 2021-01-05 23:06:16 +00:00
Varun Shah
f20d333ada DO NOT MERGE: Disable StrictMode VM Policy check. 
Disable the VM policy violation for intents that contain a content URI
but don't have FLAG_GRANT_URI_PERMISSION when scheduling alarms.

Fixes: 160426113
Test: atest CalendarProvider2Test
Change-Id: If6e4a03609fc3d03dde66bcaa3136b23662ccaeb
(cherry picked from commit 224822ecaf)
 2021-01-05 21:27:13 +00:00
Andrei Onea
46111c8ea0 Add force_non_debuggable_final_build_for_compat 
This flag forces the compat framework to assume we're on a
non-debuggable build, and use stricter rules for enforcing
the change id override policy.
On a non-debuggable build, this flag has no effect.

Test: atest OverrideValidatorImplTest
Bug: 158696818
Change-Id: I3b13f1898e7ff00580140debe2ced9f8074502ea
 2020-12-30 14:52:51 +00:00
Treehugger Robot
03b5b82cdf Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" am: d83aa0243b am: f3b68805b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I301c695f862fee869d6dba3eaf6966ba273fc3ca
 2020-12-23 21:38:56 +00:00
Jeff DeCew
9f74d0a408 Add SettingsProvider team as OWNERS of android.provider.Settings 
Change-Id: Ifa4a11780bb934f7b644ad150f3c09493b23f9f4
 2020-12-23 16:35:05 +00:00
Allen Su
2fc4cc29bc Merge "[RCS]Add new carrier configs for presence" am: f2fdcff51e am: 992b4ffdf8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf63aec6a876ca56a464f02e0ce7997ecd94b01
 2020-12-22 01:35:07 +00:00
Allen Su
f2fdcff51e Merge "[RCS]Add new carrier configs for presence" 2020-12-22 00:26:52 +00:00
Hui Wang
ec8bb25be6 Merge "RCS Provisioning APIs for Single Registration" am: 7c9eef5613 am: 81b3cfc4fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7bcf565faab1a95185f0b6ecdcc6e9dd8c03e53
 2020-12-17 23:18:25 +00:00
Hui Wang
7c9eef5613 Merge "RCS Provisioning APIs for Single Registration" 2020-12-17 22:53:31 +00:00
Hui Wang
e92ddfef4f RCS Provisioning APIs for Single Registration 
Bug: 154864150
Test: atest FrameworksTelephonyTests:com.telephony.ims.RcsConfigTest
Test: atest TeleServiceTests:com.android.phone.RcsProvisioningMonitorTest
Test: atest CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Merged-In: Ie9445dd450d175e0dc94b63b487dda5cde729123
Change-Id: Ie9445dd450d175e0dc94b63b487dda5cde729123
 2020-12-17 17:13:24 +00:00
Hui Wang
a82cdddff4 Merge "Added cross sim calling settings support" am: 7f6a8a9648 am: aa7996126a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e2954338461b79f069c5efc6f15acb38c0538fc
 2020-12-17 16:52:04 +00:00
Hui Wang
7f6a8a9648 Merge "Added cross sim calling settings support" 2020-12-17 15:14:42 +00:00
Hui Wang
ce026fd5b9 Added cross sim calling settings support 
Added a telephony provider entry for storing the
user's settings.

Fix: 173250681
Test: Manual
Merged-In: I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415
Change-Id: I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415
 2020-12-17 00:57:18 +00:00
Jeff Sharkey
95dfa1a859 Merge "Additional OWNERS coverage for storage." am: d111833fd3 am: c7077507d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8835ec5c6b26fa726ea83801e7ffb4d706dd4df
 2020-12-16 22:33:44 +00:00
Jeff Sharkey
9ac773a60b Additional OWNERS coverage for storage. 
Bug: 174932174
Test: none
Change-Id: I265ebd077d27d0d52d97a2c3c4a7147368be2498
 2020-12-16 14:47:45 -07:00
Tianjie Xu
2fd269494a Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12512a441b330e062fe8e8d482a367e719c7d45d
 2020-12-15 00:03:48 +00:00
Tianjie Xu
6083210d17 Merge changes Icf10d577,Ia9d3cae7 
* changes:
  Factor out a class to store the rebootEscrow key
  Add namespace in DeviceConfig to support ota teams's features
 2020-12-14 22:58:46 +00:00
Tianjie
e315bfa55b Add namespace in DeviceConfig to support ota teams's features 
One sample usage is to toggle between server based or HAL based
implementation for resume on reboot.

Bug: 172780686
Test: adb shell device_config put ota server_based_ror_enabled true；
Check the value in system server code

Change-Id: Ia9d3cae788e9316850ce1fc417c12b5fc109b1a3
 2020-12-14 11:21:17 -08:00
allenwtsu
e6ddc2fb14 [RCS]Add new carrier configs for presence 
KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL
KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL
KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL

Bug: 173828080
Test: build pass
Change-Id: I8e0f1ea824e8f9fdf409adb821325185b8ba457d
 2020-12-11 23:59:30 +08:00
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