Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
548,405 Commits 3 Branches 0 Tags
a8eb5da27ec8e54ddbabc46a4fd86dcedcfbfccf
Commit Graph

13400 Commits

Author SHA1 Message Date
Automerger Merge Worker
437e809139 Merge "Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev am: 0093603809 am: 3e05781310 am: 34e7d62cd5" into rvc-qpr-dev-plus-aosp am: bc48b31202 
Change-Id: If85a2ce8b4db74e834de8e4733ecc831888ce92d
 2020-05-27 19:11:09 +00:00
Brad Ebinger
f06af04dc2 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev am: 0093603809 am: 3e05781310 am: 34e7d62cd5 
Change-Id: I3b88544233339a9b244a15d50ccbedc5d0d67f12
 2020-05-27 18:49:08 +00:00
Brad Ebinger
0093603809 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev 2020-05-27 18:10:51 +00:00
TreeHugger Robot
8e4e27d582 Merge "Remove spammy log line." into rvc-dev am: 505380e42c am: 5671bd38db am: ea9dead25f am: 61cd7f0225 
Change-Id: Idcc1d36e8362ee06070c0797a216d8ce1dcb3aca
 2020-05-27 04:01:11 +00:00
TreeHugger Robot
5671bd38db Merge "Remove spammy log line." into rvc-dev am: 505380e42c 
Change-Id: I62364fa7772662b5e0523945568dbdce9f1c37b7
 2020-05-27 03:19:36 +00:00
TreeHugger Robot
505380e42c Merge "Remove spammy log line." into rvc-dev 2020-05-27 03:01:09 +00:00
Amit Mahajan
5c5635ac7d Remove spammy log line. 
Test: TH
Bug: 157172358
Change-Id: Ib76bd317bdd21ef6c1272d38f102f8e40b66d9b8
 2020-05-26 14:51:21 -07:00
Allen Su
2b022bf226 Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050 am: 6dac0489e5 am: 4a55644d1d am: 0e6f7a818b 
Change-Id: Ib791675ea9599db65c2a218840232707190ee8a9
 2020-05-25 04:02:19 +00:00
Allen Su
4a55644d1d Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050 am: 6dac0489e5 
Change-Id: I5b57578c6b74422cf4bdebee628602f700d25197
 2020-05-25 03:29:12 +00:00
Allen Su
0e3639174d Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050 
Change-Id: I8e6f40aee0c4bff7d7784accb75edc41471e3486
 2020-05-25 03:14:33 +00:00
Allen Su
07fd727050 Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev 2020-05-25 02:54:22 +00:00
Brad Ebinger
ffb93e5dd6 Remove IllegalArgumentException for registration of capabilities 
We threw an IllegalArgumentException for an invalid subscription,
however this is counter to what this exception should be used for.
Instead, use ImsException#CODE_ERROR_INVALID_SUBSCRIPTION.

Also fixed incorrect ImsException sent when telephony crashed.

Bug: 156402275
Test: atest FrameworksTelephonyTests; CtsTelephonyTestCases; manual
Change-Id: I3250419a2438afb58922ae653e3f2e4f9628e593
 2020-05-21 16:41:01 -07:00
Brad Ebinger
ab92b16d31 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8 am: 7064773052 am: 944ecbc8c1 am: f6430a20bc 
Change-Id: Id9eb2091d464281011cd3865af5c2fa30d6c6994
 2020-05-20 20:14:51 +00:00
Brad Ebinger
944ecbc8c1 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8 am: 7064773052 
Change-Id: I2b54773d8a029fd79219f1ec12e3d3925665c7d8
 2020-05-20 19:45:28 +00:00
Brad Ebinger
9ced939313 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8 
Change-Id: Id06fda9d0a3f3995c9497410e79ccb72c4862a43
 2020-05-20 19:28:00 +00:00
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +00:00
Hall Liu
577a00745e Merge "Rename addServiceAnnouncement-related methods" 2020-05-19 22:35:16 +00:00
allenwtsu
6206afc8c1 [KDDI] Define carrier config for call forwarding items 
Test: build pass
Bug: 149274975
Change-Id: Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb
 2020-05-19 23:06:33 +08:00
Amit Mahajan
46137cea35 Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b am: 963957ed4d am: b166347b64 am: c7e11453a5 
Change-Id: I9d696fa3a69173a355c6575b0da275caddc2b173
 2020-05-19 01:06:48 +00:00
Brad Ebinger
64e101323b Fix MmTelFeatureConnection Memory Leak 
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Test: atest FrameworksTelephonyTests
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
 2020-05-18 17:46:06 -07:00
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b 
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
 2020-05-19 00:16:28 +00:00
Amit Mahajan
67bec2d79b Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c 
Change-Id: I50ca70c0e9a3a20bc64604e9e05cec619111679f
 2020-05-18 23:55:10 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +00:00
TreeHugger Robot
d0c0e055b7 Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 am: baa92662b4 am: ae40c1a22d am: 67e020260e 
Change-Id: Ib0d9e4efcb5cd1d6c13f677ca4e700cc490fd658
 2020-05-18 23:37:51 +00:00
TreeHugger Robot
baa92662b4 Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 
Change-Id: I40924079a2fa2c2db2eec7346e3989c4cbed6186
 2020-05-18 23:09:39 +00:00
Hunter Knepshield
1eee66b8ea Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e am: 15e6f1e9f0 am: af14bbe0e0 am: 2ea9511187 
Change-Id: I5a5bc545a4869c83fc3f819eaaf360bcce7ff586
 2020-05-18 23:05:31 +00:00
TreeHugger Robot
b8ec05c9f0 Merge "Fix UCE docs" into rvc-dev 2020-05-18 23:04:41 +00:00
Hunter Knepshield
15e6f1e9f0 Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev am: 7eeed0981e 
Change-Id: I8f97fcc445aa504fb29bf8e6f6bde06533f91322
 2020-05-18 22:33:52 +00:00
Hunter Knepshield
7eeed0981e Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev 2020-05-18 22:30:16 +00:00
Hunter Knepshield
e23886b901 Reapply aosp/970247 to fix SubInfo#toString. 
Looks like somewhere along the line this was partially overwritten by
another change. This makes the toString value consistent and stops the
MNC field from running into the country ISO code.

Test: compilation (trivial)
Change-Id: Ifdc00d340ae8ce31c224decebdd6c7aa4230bdb7
Bug: 8675309
 2020-05-18 22:29:59 +00:00
Hall Liu
6158137cf2 Rename addServiceAnnouncement-related methods 
Address feedback on the API

Fixes: 155926142
Test: CTS
Change-Id: I69e17faf4d09ab686fdd97975bc7f069597b87b3
 2020-05-18 14:52:18 -07:00
Brad Ebinger
1735254a44 Fix UCE docs 
Clarify some of the docs for UCE Intent.

Fixes: 156114453
test: docs only
Change-Id: I01617d0741055e347e05bdbd5eb5a6825f896e73
 2020-05-18 21:22:26 +00:00
Sarah Chin
52513714b9 Merge "Create carrier config for NR enabled setting" into rvc-dev am: a718624635 am: 955e16b73e am: 35d9bafc45 am: ee4d243783 
Change-Id: Id73be1823f680061de32ba923c0f1109a8180a91
 2020-05-15 20:58:35 +00:00
Sarah Chin
955e16b73e Merge "Create carrier config for NR enabled setting" into rvc-dev am: a718624635 
Change-Id: Iafffb1890848729d4983f06b2268d1e294cd43d5
 2020-05-15 18:49:12 +00:00
Sarah Chin
a718624635 Merge "Create carrier config for NR enabled setting" into rvc-dev 2020-05-15 18:47:12 +00:00
Calvin Pan
ae73995b0b Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40 am: eab99d7eac am: 4fc3fb592c am: 3585e26793 
Change-Id: I0037177a42e58e3d5f9d9157de6868534eb7de83
 2020-05-15 16:01:40 +00:00
Calvin Pan
3585e26793 Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40 am: eab99d7eac am: 4fc3fb592c 
Change-Id: I86f522c4eb876ded6eb204b4b4f07b3af3f149eb
 2020-05-15 15:43:08 +00:00
Calvin Pan
58f63aee4b Merge "Update getSimCarrierId() document" into rvc-dev am: 4bf8746b40 
Change-Id: Id1101bb990e3f308f0743daeb665ca76404a9710
 2020-05-15 15:42:51 +00:00
Sarah Chin
39c87c67d8 Create carrier config for NR enabled setting 
Test: build
Bug: 155915216
Change-Id: Ib81bb6b1712fcf53723df04f162c50a89c96e04d
 2020-05-13 23:44:12 -07:00
Calvin Pan
4bf8746b40 Merge "Update getSimCarrierId() document" into rvc-dev 2020-05-14 01:59:25 +00:00
calvinpan
18d70ab7b0 Update getSimCarrierId() document 
Carrier_list.pb move to latest_carrierid/ folder, so update the
description.

Bug: 155254987
Test: Build pass
Change-Id: Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3
 2020-05-13 12:11:33 +08:00
Xiangyu/Malcolm Chen
2dfc9f85fe Merge "Rename max.active.modems to active_modems.max_count" into rvc-dev 2020-05-12 18:12:53 +00:00
Shuo Qian
9e80bca139 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" am: a059affff3 
Change-Id: I2b7a90343be8d2e3b69d78dae9890ba28f01939f
 2020-05-11 22:38:07 +00:00
Brad Ebinger
f00f6c2145 Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dcf9 am: ce1220b912 am: 713754a8c8 am: 98c076d1e7 
Change-Id: I6d455307c27fa30090357d8d4fdb589ebfcfeaff
 2020-05-11 21:19:26 +00:00
Shuo Qian
8f88f4e1ab Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd am: 39ba45aee1 am: 7e51acd5b7 am: 8f3dbd0c92 
Change-Id: I0d5913d4a97812c8342e4417ccbab04fa8bacb70
 2020-05-11 21:17:44 +00:00
Shuo Qian
e2faa8fff8 Modify the default values to avoid 2 DB hysteresis DB limitation 
Test: Treehugger
Bug: 155026280
Change-Id: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
Merged-In: Ic1af774b28629c7ab0e105f6ce198bfce8d160a8
(cherry picked from commit 66c51cda97)
 2020-05-11 20:57:28 +00:00
Brad Ebinger
ce1220b912 Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev am: 3e79d2dcf9 
Change-Id: I65055dd607613c5cddb3300552c89e86ef13bb20
 2020-05-11 20:38:51 +00:00
Shuo Qian
39ba45aee1 Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd 
Change-Id: I5f8595cfd67dc60ab78faffafc19fa0a3976a472
 2020-05-11 20:37:25 +00:00
Brad Ebinger
3e79d2dcf9 Merge "Do not throw RemoteException for notifyUserActivity" into rvc-dev 2020-05-11 20:35:00 +00:00
Shuo Qian
95ff60f2fd Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev 2020-05-11 20:22:13 +00:00