Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
438,452 Commits 3 Branches 0 Tags
2dcd338a4682f9d18005b69726dfd3e94682bc83
Commit Graph

5322 Commits

Author SHA1 Message Date
Meng Wang
ddf215dd58 Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" 2019-12-05 23:23:51 +00:00
Meng Wang
646dcbd0ed Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY 
Replaced with SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX. Both are set
in Intent extras by SubscriptionManager#putPhoneIdAndSubIdExtra.

Bug: 140908357
Test: make
Change-Id: I54a65ef81acc68c34af6263e929634f15f05e494
 2019-12-05 12:12:20 -08:00
Zoey Chen
8e708ff380 Merge "[Telephony mainline] Add SystemApi and NonNull annotation" 2019-12-05 07:58:03 +00:00
Jack Yu
258e925cd6 Merge "Added sub id to SmsCbMessage" 2019-12-04 17:34:01 +00:00
zoey chen
1acbb9c031 [Telephony mainline] Add SystemApi and NonNull annotation 
Bug: 143860012
Test: make
Change-Id: I619d6ba04cb28830e3995feb02ffcb592ff65818
Merged-In: I619d6ba04cb28830e3995feb02ffcb592ff65818
 2019-12-04 11:40:07 +08:00
Jack Yu
29dfebb84c Added sub id to SmsCbMessage 
Added a new field subscription id to SMS
cell broadcast message.

This is the preliminary step of deprecating
CellBroadcastMessage class.

Bug: 144891074
Test: Manual

Merged-In: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
Change-Id: I23f61e77f6a9a16ce77f7892ba96fd7485c555a4
(cherry picked from commit 750b8b1972)
 2019-12-03 11:43:59 -08:00
Zongheng Wang
6b30bf8a7f Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" 
am: 3908351777

Change-Id: I75c245ec452cc8b3918143500ea7f1dad7b0baa7
 2019-12-02 14:15:58 -08:00
Treehugger Robot
3908351777 Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" 2019-12-02 22:07:21 +00:00
Zongheng Wang
02f82e233d Move Bluetooth specfic APIs called in Settings to BT DatabaseManager 
Bug: 142004000
Test: Manual
Change-Id: I45f93ce35813fff9677c2d41e6f31622bc04ca09
Merged-In: I89b0ab44920b1deefe7523e5f19ed1c799c4c658
 2019-12-02 19:53:08 +00:00
Meng Wang
9b84a44f04 Merge "Move android.provider.Telephony to frameworks/base/core" 
am: 4d0df870cd

Change-Id: I1015777c7fa0e5b67ea3d9da4c14036842b527aa
 2019-11-27 13:31:23 -08:00
Meng Wang
6b2264a1cb Move android.provider.Telephony to frameworks/base/core 
Bug: 145232482
Test: make
Change-Id: I49a9e8b1b5e3c99f0ed84638fc9f79202b0189b3
 2019-11-27 11:06:43 -08:00
Meng Wang
9e294c69d3 Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" 
am: 9636d7e3af

Change-Id: Id83ddc2f1b6d686e6249132f0e32b5a109e180cb
 2019-11-19 22:07:44 -08:00
Treehugger Robot
9636d7e3af Merge "Do not use hidden telephony API PhoneConstants.PRESENTATION_*" 2019-11-20 04:26:47 +00:00
Meng Wang
91e4cc8a7c Do not use hidden telephony API PhoneConstants.PRESENTATION_* 
Replaced with TelecomManager.PRESENTATION_*

Bug: 140908357
Test: make
Change-Id: Ib7c2531d69b14307e17ed5dd62f3aa8d56153330
 2019-11-18 17:03:02 -08:00
Artur Satayev
59318bab67 Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." 
am: a98026f7aa

Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
 2019-11-13 10:33:06 -08:00
Artur Satayev
5a525851a8 Add @UnsupportedAppUsage to test apis that are known to be used by apps. 
go/testapi-enforcement

Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
 2019-11-13 15:05:56 +00:00
Tyler Gunn
0f0dfaca35 Merge "More telephony updates for mainline." 
am: 5be8504888

Change-Id: Ifbe3370b075651738e26c613c914dfb8e5ab3338
 2019-11-11 19:41:26 -08:00
Tyler Gunn
5567d7408c More telephony updates for mainline. 
Add new TelecomManager#getDefaultDialerPackage which is multiuse aware;
this is used when showing the voicemail notification.
Remove some @hide methods from Conference; push these inline.
Move ConferenceParticipantConnection into frameworks/opt/net/ims since
it is just an IMS implementation detail.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
Merged-In: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
 2019-11-08 21:27:32 +00:00
Hall Liu
5925c3bb29 Merge "Add new SystemApi methods for mainline" 
am: f363f3549e

Change-Id: I463ca5c1745b236e5771808e70d77edd744a3714
 2019-11-08 07:57:39 -08:00
Hall Liu
d2f962a6db Add new SystemApi methods for mainline 
Add new SystemApi methods for Telecom to call in lieu of the old @hide
methods. Also moved CallerInfo and CallerInfoAsyncQuery to Telecom
because there are no more users in Telephony.

Bug: 141576016
Test: CTS
Change-Id: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
Merged-In: I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4
 2019-11-07 17:22:28 -08:00
TreeHugger Robot
abc015499a Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master 2019-10-31 18:38:40 +00:00
Phil Weaver
f4d1789b81 Merge "a11y: don't crash the system when illegal component name encounted" 2019-10-31 01:29:30 +00:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
 2019-10-30 14:33:01 -07:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Chen Xu
3f1055a2ba Merge "make CallerInfo as SystemAPI" 
am: 7e902363a6

Change-Id: I7615196e88b03a733daa895e9ffb7ee3d7a47034
 2019-10-25 10:37:43 -07:00
Chen Xu
fba9ca44a2 make CallerInfo as SystemAPI 
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit b9a1eefec6)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
 2019-10-21 21:39:58 -07:00
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master 
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
 2019-10-14 22:54:53 +00:00
joshmccloskey
2c712acefa Added secure setting for face re enrollment. 
am: cfc621518c

Change-Id: If3ed42ee2cebd112a5d243eab516f25dc3946e92
 2019-09-26 20:06:54 -07:00
joshmccloskey
cfc621518c Added secure setting for face re enrollment. 
Test: Verified that the flag could be modified with
adb shell settings put secure...
Bug: 141380252

Change-Id: Ifa24b688a487482e5b02689c1046d85423f73280
 2019-09-26 15:54:45 -07:00
Amit Mahajan
0c8c4978ab Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093 am: f87866ba9f 
am: fd8765b95e

Change-Id: I1ce7fc6f311f9462f1f505ef5387b2416728c794
 2019-09-17 10:49:05 -07:00
Amit Mahajan
fd8765b95e Merge "Fix descriptions for default SIM in global preferences" am: eeeb74a093 
am: f87866ba9f

Change-Id: I93c5b77138ce7b23e27371a7be15f00e25b987e1
 2019-09-17 10:43:02 -07:00
Amit Mahajan
f87866ba9f Merge "Fix descriptions for default SIM in global preferences" 
am: eeeb74a093

Change-Id: Ie4e492062c0c1a91b36abce43fde3506ae2cbc60
 2019-09-17 10:31:23 -07:00
Taesu Lee
0399854df0 Fix descriptions for default SIM in global preferences 
Test: Not required.

Change-Id: I7f32eb495b53d13aba50b07d86e63f0549e9e6bb
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-09-17 13:45:54 +09:00
Mady Mellor
fd48588768 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:51 +00:00
Mady Mellor
a5813e0e3d qt-r1-bubbles-dev @ build 5835883 
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ia7364529ea58070c8d45ecd726ab6ac7d34f2abe
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
Merged-In: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
 2019-09-11 22:42:54 +00:00
Mady Mellor
3e3e48e981 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:21 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
 2019-09-10 11:16:29 -07:00
Mady Mellor
8e10394ccc qt-r1-bubbles-dev @ build 5835883 
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ic3a4ba793db7f1361678ef51c411d9eab85d9b85
Merged-In: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
 2019-09-09 21:48:30 +00:00
Jonathan Scott
7f08445f65 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 
am: 719cd95a84

Change-Id: I27898e265c24dbb7c4668cb47dbcb23ebdbf2b95
 2019-09-06 04:57:04 -07:00
Jonathan Scott
719cd95a84 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev 
am: b01fe73ed3

Change-Id: I800c640883b1ef9eff5fff0200a0785ccd2d18ae
 2019-09-06 04:44:09 -07:00
Jonathan Scott
68f73efcb9 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev 
am: b01fe73ed3

Change-Id: Idd7424cf00a3c5d8d41e3e051d78d0ac4d6c4a19
 2019-09-06 04:44:06 -07:00
Jonathan Scott
a5e4422d14 Add MANAGED_PROVISIONING_DPC_DOWNLOADED. 
Test: Just adding a constant
Bug: 132261064
Change-Id: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
Merged-In: I2bce277ff8f2de4614e19d5385fe6712b076f9c9
 2019-09-05 17:31:12 +01:00
Aurimas Liutikas
488d37b2d0 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: ed5beec21b 
am: de0ebb082e

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
 2019-08-30 08:54:38 -07:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be 
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
 2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b Merge "Add missing nullability annotations." into stage-aosp-master 
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
 2019-08-30 08:35:52 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations. 
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
 2019-08-30 00:14:44 +00:00
Ian Kasprzak
1a5bb83588 [DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495 
- Moved exclude filters to existing stanzas
- Removed new stanzas added w/ filters
- Removed un-needed filters because existing "include-filter"
  already excludes failing tests.

Disabling in preparation for merge to aosp-master (Q release).

Disabling the following tests:
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest

Test: Forrest
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests
for AOSP push to Q.

Change-Id: I4dc2408c5bc6d421654f871c5d63d402c1d96d91
 2019-08-29 10:38:56 -07:00
Raman Tenneti
f997c75d69 [DO NOT MERGE] Disabled the following tests in TEST_MAPPING: 
FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate
CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices
CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures
CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest

Disabling in preparation for merge to aosp-master (Q release).

Test: Forrest (atest)
L55600000358896983, L81400000359164936
BUG: 139704630
BUG: 139535570
BUG: 139536812
BUG: 139535125
BUG: 139305203
Change-Id: I9be2efd464fe031a0269fa5a3913ddb4959ba05d
Exempt-From-Owner-Approval: Disabling known failing TEST_MAPPING tests for AOSP push to Q.
 2019-08-28 23:48:13 +00:00
Long Ling
7adf3f0109 Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev 
am: 30e9250f19

Change-Id: I6db03bb92b73c799944764014acb31ebc3038165
 2019-08-26 21:59:12 -07:00
Long Ling
3b58effa1a DMD: Support minimum refresh rate 
Bug: 139685237
Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
 2019-08-26 11:59:13 -07:00