Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557,257 Commits 3 Branches 0 Tags
1507e59477ea2cd4842affdd83ec3ef4d4f2e089
Commit Graph

5974 Commits

Author SHA1 Message Date
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
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
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
Arc Wang
d631c648b3 Add a SettingsProvider key for Adaptive connectivity 
Adaptive connectivity is a feature to manage 5G connectivity
for better battery life.

Bug: 162871294
Test: compile
Change-Id: I719e44a29a54ee886e5d3a7180fd3ad9a7dff599
Merged-In: I719e44a29a54ee886e5d3a7180fd3ad9a7dff599
 2020-08-24 20:26:16 +08:00
Beth Thibodeau
865643a12d Merge "Allow user to block individual apps from resuming" into rvc-qpr-dev am: 3743d5526a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12391748

Change-Id: Ief6bfded76c4fe6d1636f9af1c67659b2b84ab63
 2020-08-18 14:39:26 +00:00
TreeHugger Robot
73f4897f80 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 377b7f318d am: f6d2c0abc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12375470

Change-Id: Ib327facf7026ac4f406846128c84005478fd2d2c
 2020-08-17 20:38:28 +00:00
TreeHugger Robot
f6d2c0abc5 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp am: 377b7f318d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12375470

Change-Id: Ief345ee98cd8758baa1adde984abe01a753dce5c
 2020-08-17 20:25:52 +00:00
Beth Thibodeau
70b5235a9d Allow user to block individual apps from resuming 
This adds a setting which stores a list of packages that will be
prevented from persisting in QS as resumable media controls, even when
resumption is enabled. If the user adds a new package to this list when
it already has a resume control, that control will be removed.

Bug: 161813143
Test: manual, atest
Change-Id: I8c85bc937aeaf366954f2669eba8f6954640fe4c
Merged-In: I8c85bc937aeaf366954f2669eba8f6954640fe4c
 2020-08-17 15:45:47 +00:00
Peiyong Lin
b18a2fccc3 Rename game driver to updatable driver. 
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.

Bug: b/164449016
Test: build
Change-Id: I787f97b4801dcc7b5ec2acd569a7ce284c9a1f18
 2020-08-14 10:44:59 -07:00
Xin Li
da7d27b21e Merge QQ3A.200805.001 
Bug: 162879794
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Change-Id: Idbcffbd09045575e92297fd6e0071a56a4e3cbae
 2020-08-05 17:40:02 +00:00
Peiyong Lin
a5220103f1 Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a am: 8d7604a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4bbdb5252dcf1e73bdd0b05e382bb8a6482bd8df
 2020-08-01 07:01:51 +00:00
Peiyong Lin
8d7604a4cb Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4caee590c4fdd4f0d595ae091332555dff3654a8
 2020-08-01 06:40:51 +00:00
Blake Kragten
7766abe213 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 am: 44d92fce4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174522

Change-Id: Ibdbe411dddcdae75effcffc20790047a5efe5bcd
 2020-07-29 23:45:51 +00:00
Blake Kragten
44d92fce4d Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174522

Change-Id: I09d21b8405050e4ef1474444ca5ec0b7f71406be
 2020-07-29 23:27:51 +00:00
Blake Kragten
9c50208f54 Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev am: f4c4ca2327 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12174522

Change-Id: Ibed4b20e1ebe8c0c464a0f068ffaa3dc46ad1764
 2020-07-29 23:26:26 +00:00
Peiyong Lin
7bc64bdf00 Use more inclusive terms. 
BUG: b/162288333
Test: N/A
Change-Id: Icd58adb5eb19395548f20bd9349639e84a0cce88
 2020-07-29 16:23:28 -07:00
Blake Kragten
c09d09906a Remove Enhanced Connectivity Dev Option 
Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I58938faa299e30d4f357ed4e094b8548964b9dcc
 2020-07-28 22:44:27 +00:00
Peiyong Lin
e5133fac3a Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp am: adda6254d8 am: 057d3ace10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12245299

Change-Id: If6852756f543023a23b10a2070962c297f8d81cd
 2020-07-28 19:11:05 +00:00
Peiyong Lin
057d3ace10 Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp am: adda6254d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12245299

Change-Id: Ibccd82b97a3baf95aee0407eedc6da428237e2ca
 2020-07-28 18:57:07 +00:00
Peiyong Lin
b967a4c381 Use more inclusive terms inside GraphicsEnvironment. 
Bug: b/162288333
Test: N/A
Change-Id: I2f1f13a892be0c8ff3f89e0ceabe39058390727d
 2020-07-27 23:57:50 -07:00
Treehugger Robot
f386456e8c Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a am: 40b66a14d8 am: d2d9f54da1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: Ib2c6beaf4782b2014c65914647270af7d660e2cf
 2020-07-16 01:53:34 +00:00
Treehugger Robot
d2d9f54da1 Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a am: 40b66a14d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I5a4a4454d4e0ee958e3b2fdab0e456f942ec5b6b
 2020-07-16 01:33:36 +00:00
Treehugger Robot
40b66a14d8 Merge "Show subId info for getMessagesFromIntent log if it available only" am: 6478559721 am: 83b308025a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318274

Change-Id: I07a163cbfaf5e76f94d758953fed8d48c6cc66d8
 2020-07-16 01:18:14 +00:00
Hall Liu
b637852572 Merge "Allow empty tokens in strict grammar" into rvc-qpr-dev am: b5954fba49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12150923

Change-Id: I73f2188ffd12e3018849c1f2672f6c7d64bf1f43
 2020-07-15 16:24:10 +00:00
Hall Liu
a3986a5def 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-07-14 20:42:25 +00:00
Taesu Lee
7e26fe7ce3 Show subId info for getMessagesFromIntent log if it available only 
getMessagesFromIntent with default SMS subId log is shown from
AppSmsManager for MT SMS always since an intent without subId info is
delivered to AppSmsManager first.
It might be confusing when checking MT SMS log for multi-sim devices.

Bug: 161156506
Test: MT SMS and Check log

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I66da0d5d9802c4427572cb1674be452582066450
 2020-07-14 12:14:07 +09:00
TreeHugger Robot
7b6275dd3e Merge "Fixed that data connections not tearing down when APN set id changes" into rvc-d1-dev am: 89749a90da am: be2ed83e02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12102524

Change-Id: I9946e5fa01da0c702a76b8cc47266fc39121fa75
 2020-07-08 22:37:19 +00:00
TreeHugger Robot
6208d9f85d Merge "Fixed that data connections not tearing down when APN set id changes" into rvc-d1-dev am: 89749a90da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12102524

Change-Id: I89074c2299610d27aa1bcb6ee458f9fa9e24b89e
 2020-07-08 22:27:57 +00:00
Jack Yu
715073fc69 Fixed that data connections not tearing down when APN set id changes 
When APN set id changes (by changing the preferred APN in settings),
the existing data connections from previous APN set id should be
torn down. Fixed by checking the APN set id when building the
waiting APN list and tethering APN list.

Fix: 159761970
Test: DcTrackerTest
Change-Id: I626f871b64d50127feece80f018272e51ad1c66c
 2020-07-07 17:21:17 -07:00
Kweku Adams
aea41aec2b Merge "Disable restricted bucket." into rvc-dev am: 6cca001863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740346

Change-Id: If3eb3f5bcb9b99e3bed7f89ba03048bb8f7d3f05
 2020-06-23 00:18:30 +00:00
Kweku Adams
6cca001863 Merge "Disable restricted bucket." into rvc-dev 2020-06-23 00:13:41 +00:00
Sarah Chin
957f0a5285 Add Setting for NR screen off indications 
Test: build
Bug: 154241884
Change-Id: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
Merged-In: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
 2020-06-22 16:15:03 -07:00
Beth Thibodeau
7a2dfd3422 [DO NOT MERGE] Support toggling resumption in Settings am: c1bc307bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817534

Change-Id: Ie0520c407c27112a05049ef6627528e204ffdff2
 2020-06-19 22:40:39 +00:00