Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
481,466 Commits 3 Branches 0 Tags
06b3defee1d31d8eb2ca117ef7d47fc8dfd4f830
Commit Graph

12408 Commits

Author SHA1 Message Date
Automerger Merge Worker
3a48e23b5d Merge "API Review: Rethrow from system server for ImsCallSessionListener" into rvc-dev am: 5463a87fc3 am: 09003ca464 am: b27f199adf am: 0417aa72b0 
Change-Id: I53c14a633df1c85d4bc5de3ad78361a07f1c0d91
 2020-03-10 20:55:23 +00:00
Sooraj Sasindran
51a5e36b3b Merge "change getActiveAndHiddenSubscriptionInfoList API name" 2020-03-10 20:07:38 +00:00
Automerger Merge Worker
b27f199adf Merge "API Review: Rethrow from system server for ImsCallSessionListener" into rvc-dev am: 5463a87fc3 am: 09003ca464 
Change-Id: Ieead5efb52ac5d0c20c6f8efe22a0afec5d91b2c
 2020-03-10 17:40:43 +00:00
Brad Ebinger
5463a87fc3 Merge "API Review: Rethrow from system server for ImsCallSessionListener" into rvc-dev 2020-03-10 16:57:52 +00:00
Automerger Merge Worker
f6cfff5647 Merge "5G icon default changed" into rvc-dev am: de9cd9f42f am: 07ab7e3ba5 am: 8eccdd775e am: 26ad9d2c7a 
Change-Id: Id4036a9b831e5b092b956a4ed5a70ab5ef6ffe8b
 2020-03-10 10:28:07 +00:00
Automerger Merge Worker
8eccdd775e Merge "5G icon default changed" into rvc-dev am: de9cd9f42f am: 07ab7e3ba5 
Change-Id: I1d38cf2b61811efd0cab46d12440d7c67a64e6de
 2020-03-10 09:51:09 +00:00
SongFerngWang
56e1a31265 5G icon default changed 
default value:"connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G
,not_restricted_rrc_con:5G"

Bug: 150826929
Test: build pass
Change-Id: I298b0eb496f5aae8c812ccfa375e2649fc9c2a64
 2020-03-10 13:08:31 +08:00
Sooraj Sasindran
feb6aa47b4 change getActiveAndHiddenSubscriptionInfoList API name 
getActiveAndHiddenSubscriptionInfoList to getCompleteActiveSubscriptionInfoList

Bug: 144791721
Test: make
Change-Id: I6202c4039d858ccfed1d09e8b315d701bb571ccf
 2020-03-09 21:45:52 -07:00
Automerger Merge Worker
1ab43abebd Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev am: e5e8e34c7c am: 74d784437f am: 5d35bddb32 am: 36d34537b8 
Change-Id: I2c14d79ba1b455d7d2527ac70d6f69c7caa89c7e
 2020-03-10 02:02:36 +00:00
Automerger Merge Worker
5d35bddb32 Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev am: e5e8e34c7c am: 74d784437f 
Change-Id: Ieb701ed6d613df47eda0376b0011befd754ca2ef
 2020-03-10 01:26:44 +00:00
TreeHugger Robot
e5e8e34c7c Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev 2020-03-10 01:08:35 +00:00
Automerger Merge Worker
9bb1f949f1 Merge "API Fix: Remove 200 from PUBLISH_STATE_OK" into rvc-dev am: 1a72c04a67 am: 24a98b75cf am: 73e459aac7 am: 61a53fb75c 
Change-Id: I86f18230379a2e722dc8904053830aeee465be65
 2020-03-10 00:02:53 +00:00
Automerger Merge Worker
6892ef5920 Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev am: e171bca393 am: 6c343fe192 
Change-Id: I193a07a04c821eb90b72f1de33fcae4829f70621
 2020-03-09 23:35:31 +00:00
Automerger Merge Worker
1051fbf9bc Merge "API fix: Rename and clarify ProvisioningManager constants" into rvc-dev am: 1084c52acf am: 5b53c0bef9 am: e7337c6cfd am: 9bdd26dc40 
Change-Id: Ide4c401b1459c230ba36c649c45516345321d9b8
 2020-03-09 23:23:16 +00:00
Shuo Qian
e171bca393 Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev 2020-03-09 23:17:44 +00:00
Brad Ebinger
816fdbb2b9 API fix: getProprietaryCallExtras should not return null 
Fixes: 149216142
Test: atest CtsTelephonyTestCases
Change-Id: I7bd0d44f08169d41396a8cb202f3928e14bc5939
 2020-03-09 23:14:42 +00:00
Automerger Merge Worker
cf21bb6817 Merge "API Review: Clarify deprecated docs and rethrow from system server" into rvc-dev am: 410b854a84 am: ce2dd9fc89 am: 75ffd728e8 am: 660400b5ed 
Change-Id: If0daf69043b365804a170aa49b0d1ffc1da85da0
 2020-03-09 23:13:03 +00:00
Brad Ebinger
ece30e73ab API Review: Rethrow from system server for ImsCallSessionListener 
Test: atest FrameworksTelephonyTests:ImsCallSessionListenerTests
Bug: 149997618
Change-Id: I98e7aeb033c3a5da332cc40e58ec5e066be6a2cc
 2020-03-09 23:11:48 +00:00
Automerger Merge Worker
73e459aac7 Merge "API Fix: Remove 200 from PUBLISH_STATE_OK" into rvc-dev am: 1a72c04a67 am: 24a98b75cf 
Change-Id: I1d80c9f61b09f7a8f3197b9df5f7694b4dbe7855
 2020-03-09 23:09:16 +00:00
Automerger Merge Worker
e7337c6cfd Merge "API fix: Rename and clarify ProvisioningManager constants" into rvc-dev am: 1084c52acf am: 5b53c0bef9 
Change-Id: I2bdf19f998b703086147fbbca19ea96609e2e966
 2020-03-09 23:04:31 +00:00
Brad Ebinger
1a72c04a67 Merge "API Fix: Remove 200 from PUBLISH_STATE_OK" into rvc-dev 2020-03-09 22:52:46 +00:00
Brad Ebinger
1084c52acf Merge "API fix: Rename and clarify ProvisioningManager constants" into rvc-dev 2020-03-09 22:51:53 +00:00
Automerger Merge Worker
ce2dd9fc89 Merge "API Review: Clarify deprecated docs and rethrow from system server" into rvc-dev am: 410b854a84 
Change-Id: Ic462cf52262851fca98c586485c3ff074bffbadf
 2020-03-09 22:37:08 +00:00
TreeHugger Robot
410b854a84 Merge "API Review: Clarify deprecated docs and rethrow from system server" into rvc-dev 2020-03-09 22:34:33 +00:00
Automerger Merge Worker
69762f9d9a Merge "Merge "[Telephony Mainline] Fix JavaDoc for getPremiumSmsConsent method" into rvc-dev am: 4bfc09b55c am: f6c7deb3c4" into rvc-d1-dev-plus-aosp am: 01e662cf59 am: 1bf10b7488 
Change-Id: I32f0af57bf80a5136c71b9512e7dc183c48b79a4
 2020-03-09 03:33:20 +00:00
Automerger Merge Worker
f6c7deb3c4 Merge "[Telephony Mainline] Fix JavaDoc for getPremiumSmsConsent method" into rvc-dev am: 4bfc09b55c 
Change-Id: I26ba221ef1122075dace3323f091dc6d3f2a89ed
 2020-03-09 02:36:56 +00:00
Betty Chang
4bfc09b55c Merge "[Telephony Mainline] Fix JavaDoc for getPremiumSmsConsent method" into rvc-dev 2020-03-09 02:32:13 +00:00
Brad Ebinger
6b06c64627 API fix: Rename and clarify ProvisioningManager constants 
Fixes: 148515237
Test: atest CtsTelephonyTestCases; atest FrameworksTelephonyTests
Change-Id: I633ad3270f8b7d047c3522a420746b668000d078
 2020-03-06 15:49:34 -08:00
Shuo Qian
75c49ab334 API Council Feedback - Override EmergencyNumberDB File API 
Use ParcelFileDescriptor; Introduce Reset API

Test: atest TelephonyHostTest#testEmergencyNumberDb
Bug: 147805285
Change-Id: I7a7733c02874c0f17fef8c91b9e543c8e803f504
Merged-In: I7a7733c02874c0f17fef8c91b9e543c8e803f504
 2020-03-06 22:56:25 +00:00
Shuo Qian
88758aead7 Merge "API Council Feedback - Override EmergencyNumberDB File API" 2020-03-06 22:55:06 +00:00
Automerger Merge Worker
846873d3fa Merge "Update AccessNetworkConstants to uses values from HAL" into rvc-dev am: 42d2031cc9 am: b1c4f9a41b am: 54db7ef120 am: f6ebe3ee6d 
Change-Id: Iad6e11bda164c9d4573b12d75c02e89af4de3325
 2020-03-06 19:16:10 +00:00
Brad Ebinger
6d8722cb87 API Review: Clarify deprecated docs and rethrow from system server 
1) Clarify why there are new APIs being added as @deprecated
   (backwards compatibility), and
2) onLineIdentificationSupplementaryServiceResponse should throw
an exception instead of silently failing.

Test: atest CtsTelephonyTestCases FrameworksTelephonyTests
Fixes: 149997057
Fixes: 143987946
Change-Id: I5c2bacad43917a6ecad49dcf9d3213b3472534cc
 2020-03-06 11:12:25 -08:00
Brad Ebinger
5f2d7b6a5a API Fix: Remove 200 from PUBLISH_STATE_OK 
Test: atest CtsTelephonyTestCases; manual
Bug: 149316154
Change-Id: I3e2edf69c48f90743903a257033a43d608b4f0d5
 2020-03-06 19:11:10 +00:00
TreeHugger Robot
3868a7a6fc Merge "Throw RuntimeException/ImsException when binder is null." 2020-03-06 18:52:26 +00:00
Automerger Merge Worker
b1c4f9a41b Merge "Update AccessNetworkConstants to uses values from HAL" into rvc-dev am: 42d2031cc9 
Change-Id: Iacd46f6bff17a6a75c44c9b8182967186dd6a895
 2020-03-06 18:48:41 +00:00
Sarah Chin
42d2031cc9 Merge "Update AccessNetworkConstants to uses values from HAL" into rvc-dev 2020-03-06 18:39:05 +00:00
Grace Jia
da20037842 Throw RuntimeException/ImsException when binder is null. 
Bug: 149227341
Test: atest CtsTelephonyTestCases:ImsMmTelManagerTest
Change-Id: Ida19a2f5e0bbb64facd7f08eb4ab68d120134a0e
 2020-03-06 09:23:45 -08:00
Automerger Merge Worker
20f81c1256 Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev am: e78a4b2695 
Change-Id: Ic7cce4cb21606d9bba45fe1a106bff2c27caaef0
 2020-03-06 10:22:33 +00:00
Automerger Merge Worker
fc1fa1d916 Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 0542580955 
Change-Id: I845f34b254d82b88cc313ef6cb40e52770874f19
 2020-03-06 10:21:42 +00:00
Automerger Merge Worker
4a90015ed8 Merge "Remove @ModemCount enum definitions." into rvc-dev am: 2f2742cc80 
Change-Id: Ie92664078558de81d66c2f870e353dfa567e774e
 2020-03-06 10:17:17 +00:00
changbetty
a335758c74 [Telephony Mainline] Fix JavaDoc for getPremiumSmsConsent method 
Bug: 148603739
Test: make
Change-Id: I386ca2c398d3897148fc56ebe4956cac12531590
 2020-03-06 16:46:25 +08:00
Automerger Merge Worker
9a15b2dc0a Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev am: e78a4b2695 am: ab23a3775d am: 29d6b8e7f8 am: 16c29ba959 
Change-Id: If20b040596aa50ef4bd95d8d9003247a0acc39d7
 2020-03-06 08:33:43 +00:00
Automerger Merge Worker
98cf260ec6 Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 0542580955 am: f23515ae6e am: c2bd20ad55 am: bfa43949b1 
Change-Id: I830fc485a2d7b1f6f9b3da06083d2a60e14bba22
 2020-03-06 08:32:32 +00:00
Jack Yu
9dd2585d3f Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" into rvc-dev 2020-03-06 07:51:22 +00:00
Automerger Merge Worker
8495d484ae Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" am: e225e5dc70 am: da6b0cc682 am: d636bf9e32 am: 723f37be1b am: 623244c9f6 
Change-Id: Ie4160c6cd72ee9a04452efe39f1797b573b7f2ca
 2020-03-06 06:41:08 +00:00
Automerger Merge Worker
29d6b8e7f8 Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev am: e78a4b2695 am: ab23a3775d 
Change-Id: I6001c7ad0c6ec32237c1d8ae65b27c9f0e885d82
 2020-03-06 06:38:03 +00:00
Betty Chang
e78a4b2695 Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev 2020-03-06 06:01:38 +00:00
Automerger Merge Worker
c2bd20ad55 Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev am: 0542580955 am: f23515ae6e 
Change-Id: Ia59ef9d9c756f644d474ac008c3ff0ee27e781f3
 2020-03-06 05:48:16 +00:00
Brad Ebinger
0542580955 Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev 2020-03-06 05:10:44 +00:00
Automerger Merge Worker
623244c9f6 Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" am: e225e5dc70 am: da6b0cc682 am: d636bf9e32 am: 723f37be1b 
Change-Id: Ib2b6ba991896304efc3af6a3f12b8151251ede1d
 2020-03-06 05:01:29 +00:00