Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508,996 Commits 3 Branches 0 Tags
8a478317f26abaef01fb0c968f22dfadfd378656
Commit Graph

13064 Commits

Author SHA1 Message Date
Automerger Merge Worker
b1ac0342ea Merge "Merge "Correct comments/documentation" am: a2d5e8c2bf am: 5a02fb8e59" into rvc-dev-plus-aosp 2020-06-05 20:04:49 +00:00
Shi Lu
23a250eeb7 Merge "Correct comments/documentation" am: a2d5e8c2bf am: 5a02fb8e59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1299587

Change-Id: I76880af2dcfe1951d272ec27bf2ba282aef5ed34
 2020-06-05 20:04:33 +00:00
TreeHugger Robot
bc1b5f3f6c Merge "Update UL values for NR" into rvc-dev am: a4d247cfbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739778

Change-Id: Ic428042f124f4e0c40370b00d1df9f769b7a845d
 2020-06-05 20:04:18 +00:00
TreeHugger Robot
a4d247cfbf Merge "Update UL values for NR" into rvc-dev 2020-06-05 19:55:07 +00:00
Shi Lu
5a02fb8e59 Merge "Correct comments/documentation" am: a2d5e8c2bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1299587

Change-Id: Id382c91f9d6fbc4c7dc5ba577d1e0e9b89dd0976
 2020-06-05 19:51:07 +00:00
Shi Lu
a2d5e8c2bf Merge "Correct comments/documentation" 2020-06-05 19:35:27 +00:00
Sarah Chin
6963421dfe Update UL values for NR 
Test: build
Bug: 158218596
Change-Id: I2d548711c5de9683b57dc7bbeea9379d23b18343
 2020-06-04 11:29:21 -07:00
Allen Su
63c1d4e812 Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322498

Change-Id: I153f47181cd6a1052751518e6a9f41b924f6267d
 2020-06-04 03:18:17 +00:00
Jack Yu
28becbf0b8 Merge "Store ETWS primary information in the database" into rvc-dev am: dc9e545bd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712801

Change-Id: I2a353c1939bdd2487ffcc4df71b3903e95cdffb6
 2020-06-04 00:54:08 +00:00
Jack Yu
059be24240 Store ETWS primary information in the database 
ETWS primary/secondary flag needs to be saved in the
database in order to perform duplicate check later. Used the
hardcoded database column name because Android R API freezes.
Will remove the hardcode in the next Android release.

Fix: 157699377
Test: CtsTelephonyTestCases & CellBroadcastServiceTests
Change-Id: Iedec92a1f435f60ceb9f36637a1718adbbd7e2ae
 2020-06-03 21:18:54 +00:00
allenwtsu
2a4441dc1c [KDDI] Define carrier config for call forwarding items 
Test: build pass
Bug: 158013358
Bug: 149274975
Change-Id: Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb
Merged-In: Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb
 2020-06-03 10:18:03 +00:00
Brad Ebinger
d3360490b7 Merge "Remove IllegalArgumentException for registration of capabilities" into rvc-dev am: 0093603809 
Change-Id: I27e16b483d9a33fe5f0fadbfab9fd10ed9cdcf5b
 2020-05-27 18:24:05 +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
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
Brad Ebinger
ed917bbe47 Merge "Fix possible deadlock in incoming call" am: c203e56238 
Change-Id: Ifcfb48a88afbf4c46dcb87b8d07bac9763eb5b4f
 2020-05-27 00:41:15 +00:00
Brad Ebinger
3c1c15c9a2 Fix possible deadlock in incoming call 
When notifying the framework of an incoming call, a lock is held
in both the MmTelFeature and MmTelFeatureConnection. This can cause
a deadlock if the MmTelFeatureConnection is also processing an
event, such as sending/acknowleging an SMS message.

Remove the lock around the listener methods to the framework, since
it is not needed.

Bug: 155083563
Fixes: 155819733
Test: atest CtsTelephonyTestCases:ImsServiceTest FrameworksTelephonyTests
Change-Id: I39f7192c6f79e215ef989797870f5f501197cd08
Merged-In: I39f7192c6f79e215ef989797870f5f501197cd08
 2020-05-26 15:52:09 -07: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
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
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
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
Calvin Pan
99fb86a51a Merge "Update getSimCarrierId() document" am: 4e61079a4c 
Change-Id: I486690f2cb60629cd864d7acc919df3342a2f6ac
 2020-05-19 09:00:36 +00:00
Calvin Pan
4e61079a4c Merge "Update getSimCarrierId() document" 2020-05-19 08:40:12 +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
baa92662b4 Merge "Fix UCE docs" into rvc-dev am: b8ec05c9f0 
Change-Id: I40924079a2fa2c2db2eec7346e3989c4cbed6186
 2020-05-18 23:09:39 +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
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
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
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
301df3d935 Update getSimCarrierId() document 
Carrier_list.pb move to latest_carrierid/ folder, so update the
description.

Bug: 155254987
Test: Build pass
Change-Id: Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3
Merged-In: Iacf1bfe68fa86194e8b75cbfce9aa37c0abfbca3
 2020-05-13 10:53:12 +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
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