Commit Graph

6004 Commits

Author SHA1 Message Date
Peter Wang
9e1f4ec8c3 Add an API for LPA (SIM Manager) to bring up pages related to managing SIM profiles.
Bug: 170507492
Test: Build
Change-Id: I8a2c4e86cb3ffd6ef0dac03ec2e4968839202e7d
Merged-In: I8a2c4e86cb3ffd6ef0dac03ec2e4968839202e7d
2021-01-15 11:15:19 -08:00
Treehugger Robot
7ae76a2f3f Merge "Add feature flag for app hibernation." 2021-01-14 00:01:19 +00:00
Patrick Rohr
048bc5ea80 Add Restricted Mode handling to NetworkPolicyManager
Adds Restricted Mode functionality to NetworkPolicyManager. When this
mode is turned on (via setting), only apps with
android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS will be able to
use the network. For all other apps, the network will be blocked by the
firewall. This is controlled by a new allowlist firewall chain
fw_restricted_mode.

As a first step, this implementation still requires a reboot after the
enabling / disabling the mode to take effect. I will provide the dynamic
configuration in the next CL.

Test: atest CtsHostsideNetworkTests && atest
NetworkPolicyManagerServiceTest
Bug: 170322816
Bug: 157505406
Bug: 170322455
Bug: 175281879

Exempt-From-Owner-Approval: Change already merged on internal gerrit.
Change-Id: I0731fa842c69683953baaf9ec3a9a03454f4c607
Merged-In: I0731fa842c69683953baaf9ec3a9a03454f4c607
2021-01-12 11:59:17 +00:00
Kevin Han
f62a11079f Add feature flag for app hibernation.
Add feature flag for app hibernation so that we can begin implementing
behind a feature flag.

We use DeviceConfig as per instructions at go/android-flags-setup so
that we may eventually roll this out to dogfood devices using P/H and
Mendel.

Bug: 175829330
Test: Builds
Change-Id: I5c140ee6b20c887c9513f76254f752b1a9455a8a
Merged-In: I27b4bdd9b6ed25b06fc685183f0dc872094f1b5c
2021-01-11 13:46:33 -08: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
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
f2fdcff51e Merge "[RCS]Add new carrier configs for presence" 2020-12-22 00:26:52 +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
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
9ac773a60b Additional OWNERS coverage for storage.
Bug: 174932174
Test: none
Change-Id: I265ebd077d27d0d52d97a2c3c4a7147368be2498
2020-12-16 14:47:45 -07: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
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
84c340e6ab [DeviceConfig] add schfan to OWNERS
Test: N/A
Change-Id: I851d3925fa328d06f8165f9da9b367221b734fac
2020-11-18 23:12:02 +00:00
Mathew Inwood
f8abe13db4 Merge "Add maxTargetSdk restriction to unused APIs." 2020-11-09 14:41:20 +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
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
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
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
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
Xin Li
986e6eeddf Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07: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
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Grace Jia
e29957512c Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 am: 618efc989b am: 61c321f4fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1414388

Change-Id: If398a3b89bb6c11487d8ac2844bbf09cfb18b2b7
2020-08-28 16:56:14 +00:00
Grace Jia
61c321f4fb Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 am: 618efc989b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1414388

Change-Id: Ib4db14d7344f84383decf914fbeedf3c69384875
2020-08-28 16:29:30 +00:00
Hall Liu
256c414bbb Allow empty tokens in strict grammar
Allow empty tokens in SQLiteQueryBuilder's strict grammar enforcement

Bug: 143230980
Test: atest SQLiteQueryBuilderTest, manual
Change-Id: Ie82dded77a3eaa75095333b0e77f10e21c9f7caf
Merged-In: Ie82dded77a3eaa75095333b0e77f10e21c9f7caf
2020-08-28 00:28:53 +00:00
TreeHugger Robot
8940f10402 Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df580193
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383606

Change-Id: I7421c1f07d89d1b7c5371c83ed8a94f7f4ae9c71
2020-08-24 16:05:11 +00:00