SongFerng Wang
76ed8e15ab
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev am: 052a08bcda
...
am: bfc0a8de45
2019-08-19 13:44:57 -07:00
SongFerng Wang
bfc0a8de45
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev
...
am: 052a08bcda
2019-08-19 13:24:58 -07:00
SongFerng Wang
052a08bcda
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev
2019-08-19 18:26:03 +00:00
Nazanin Bakhshi
ce81d32525
Merge "add certs to carrier configs and store them as UiccAccessRules"
2019-08-19 17:52:43 +00:00
Leland Miller
7e98e3fe48
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf am: ecd1d67584
...
am: b6d51f117b
2019-08-19 08:45:32 -07:00
Leland Miller
b6d51f117b
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf
...
am: ecd1d67584
2019-08-19 08:36:26 -07:00
Leland Miller
ecd1d67584
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183
...
am: 4e16f07ddf
2019-08-19 08:26:30 -07:00
Leland Miller
4e16f07ddf
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e
...
am: 6ef5b6c183
2019-08-19 08:14:28 -07:00
Leland Miller
6ef5b6c183
Merge "Fix incorrect descriptions under SMS contract"
...
am: 8f48cb7e7e
2019-08-19 08:02:38 -07:00
Treehugger Robot
8f48cb7e7e
Merge "Fix incorrect descriptions under SMS contract"
2019-08-19 14:22:21 +00:00
Nazanin Bakhshi
9ed96bd9ba
add certs to carrier configs and store them as UiccAccessRules
...
Bug: 138388637
Test: tested with local override and made sure they are read and parsed
Change-Id: I50fb11444f0da33ae48683b834e6ca50941ad1b7
2019-08-16 22:52:07 +00:00
Sarah Chin
7ec874dc52
Merge "Changed regex matching for MCC and MNC"
2019-08-16 21:26:15 +00:00
SongFerngWang
52dada71a7
Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios.
...
Add RRC state condition to support more scenarios.
Carrier config KEY_5G_ICON_CONFIGURATION_STRING change default value.
Bug: 138932186
Test: atest NetworkControllerDataTest.java#testNr5GIcon_NrNotRestrictedRrcCon_show5GIcon
atest NetworkControllerDataTest.java#testNr5GIcon_NrNotRestrictedRrcIdle_show5GIcon
Change-Id: Icb8af599f95a09c5e709f00d7710e018218a23cc
2019-08-16 16:31:16 +08:00
TreeHugger Robot
c64852517a
Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
2019-08-15 23:02:12 +00:00
satayev
6f09b69e9e
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b am: 6cb0b46b2a am: 9a5fea62c9
...
am: ff545cf558
2019-08-15 15:36:15 -07:00
satayev
ff545cf558
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b am: 6cb0b46b2a
...
am: 9a5fea62c9
2019-08-15 15:22:59 -07:00
satayev
9a5fea62c9
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b
...
am: 6cb0b46b2a
2019-08-15 14:01:06 -07:00
satayev
6cb0b46b2a
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
...
am: 4a607da02b
2019-08-15 13:39:04 -07:00
satayev
4a607da02b
Merge "Move telephony/cdma/ classes into appropriate package."
...
am: 46c04b7bb8
2019-08-15 13:18:41 -07:00
TreeHugger Robot
9dfafd6a6f
Merge "Add @UnsupportedAppUsage annotations to telephony-common."
2019-08-15 17:24:14 +00:00
Artur Satayev
7c3d157392
Add @UnsupportedAppUsage annotations to telephony-common.
...
See go/UnsupportedAppUsage for more details.
This is needed to not lose greylist information, by moving telephony-common from bootclasspath in ag/9025572.
Bug: 137350495
Bug: 139336111
Test: m
Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-08-15 14:59:06 +00:00
TreeHugger Robot
fb67fb4f13
Merge "replace hidden Context APIs"
2019-08-15 10:56:38 +00:00
TreeHugger Robot
4430cbd5c6
Merge "Don't log incomplete sms apps"
2019-08-15 09:08:18 +00:00
Jack Yu
dc2620aa87
Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a07 am: 1223d76203
...
am: b7c93a760a
2019-08-14 20:56:54 -07:00
Jack Yu
b7c93a760a
Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a07
...
am: 1223d76203
2019-08-14 20:44:53 -07:00
Jack Yu
1223d76203
Merge "Added debug messages and watchdog" into qt-r1-dev
...
am: 24397e7a07
2019-08-14 20:34:50 -07:00
Jack Yu
f14bf1ee93
Merge "Added debug messages and watchdog" into qt-r1-dev
...
am: 24397e7a07
2019-08-14 20:34:47 -07:00
Jack Yu
24397e7a07
Merge "Added debug messages and watchdog" into qt-r1-dev
2019-08-15 03:15:12 +00:00
Jack Yu
36e2bfbaad
Added debug messages and watchdog
...
Added debug messages and watchdog to catch
unresponsive data service issue.
Bug: 139076980
Test: Manual
Change-Id: I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5
2019-08-15 00:07:07 +00:00
Xin Li
80860803a4
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
...
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Artur Satayev
f772c13f9d
Move telephony/cdma/ classes into appropriate package.
...
Not changing the java packages, but rather moving the source location. This allows running metalava on them.
Test: m
Change-Id: I3b46644361239d85818dd885f461dfc94de49dca
2019-08-14 10:48:10 +01:00
Brad Ebinger
736e4cebe3
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e am: a33d1aed85
...
am: ce95274ae6
2019-08-13 17:45:57 -07:00
Brad Ebinger
ce95274ae6
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e
...
am: a33d1aed85
2019-08-13 17:32:54 -07:00
Brad Ebinger
a33d1aed85
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59
...
am: 7e3661be1e
2019-08-13 17:21:23 -07:00
Brad Ebinger
7e3661be1e
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e
...
am: c64c204f59
2019-08-13 16:51:51 -07:00
Brad Ebinger
c64c204f59
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
...
am: 4204a6017e
2019-08-13 16:34:41 -07:00
Brad Ebinger
4204a6017e
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
2019-08-13 22:46:18 +00:00
Vagdevi Kondeti
78e1920ec5
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am: d7a23cc714 am: 0e3973b1b0
...
am: 360363dcf7
2019-08-13 12:31:54 -07:00
Vagdevi Kondeti
360363dcf7
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am: d7a23cc714
...
am: 0e3973b1b0
2019-08-13 12:14:29 -07:00
Vagdevi Kondeti
0ee63991f8
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
...
am: d7a23cc714
2019-08-13 12:07:32 -07:00
Vagdevi Kondeti
0e3973b1b0
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev
...
am: d7a23cc714
2019-08-13 12:07:31 -07:00
Leland Miller
958b748f7a
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8 am: 568f8bff01 am: 6d4e65a34b
...
am: 433441998b
2019-08-12 19:17:20 -07:00
Leland Miller
433441998b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8 am: 568f8bff01
...
am: 6d4e65a34b
2019-08-12 19:04:44 -07:00
Leland Miller
6d4e65a34b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8
...
am: 568f8bff01
2019-08-12 18:43:35 -07:00
Leland Miller
568f8bff01
Merge "Add documentation for Locked Messages" am: 3e85da2d89
...
am: 332f0a4ae8
2019-08-12 18:32:08 -07:00
Leland Miller
332f0a4ae8
Merge "Add documentation for Locked Messages"
...
am: 3e85da2d89
2019-08-12 18:21:16 -07:00
Leland Miller
3e85da2d89
Merge "Add documentation for Locked Messages"
2019-08-12 23:42:56 +00:00
Pengquan Meng
7b1685803f
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev am: 8a66dd0357
...
am: 3ddda4234a
2019-08-12 15:48:43 -07:00
Pengquan Meng
3ddda4234a
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
...
am: 8a66dd0357
2019-08-12 15:36:56 -07:00
Pengquan Meng
8a66dd0357
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
2019-08-12 22:24:58 +00:00
