SongFerng Wang
33f5edee25
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev
...
am: 712fc079a0
Change-Id: If745d92f94ce75b0298dbc66f53731a1faab09c4
2019-08-20 20:32:30 -07:00
James Lin
22c7dec4b7
Merge "Remove the Phone registration error notification" into qt-qpr1-dev
...
am: 507bc4ac36
Change-Id: Ia3e54831a25be0dca455e9ba78d76cfb8842858b
2019-08-20 20:27:42 -07:00
SongFerng Wang
712fc079a0
Merge "To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus" into qt-qpr1-dev
2019-08-21 03:16:52 +00:00
James Lin
507bc4ac36
Merge "Remove the Phone registration error notification" into qt-qpr1-dev
2019-08-21 03:14:05 +00:00
Nazanin Bakhshi
81b2b4536f
Merge "add certs to carrier configs and store them as UiccAccessRules" into qt-qpr1-dev-plus-aosp
2019-08-21 01:12:52 +00:00
SongFerngWang
b532af6c72
To modify 5G icon carrier config's comment: 5GPlus to 5G_Plus
...
Bug: 138932186
Test: build pass
Change-Id: Ic8625f44a5ad23a307cfb280b85bfb27da2f2b06
2019-08-21 02:42:20 +08:00
Jayachandran Chinnakkannu
0677b837d5
Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8
...
am: 0a1f1e0389
Change-Id: I13629ef2b8115381ebbe2438e4d68072fad5cfdc
2019-08-20 11:10:36 -07:00
Nazanin Bakhshi
600a9fee3a
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-20 11:07:11 -07:00
Jayachandran Chinnakkannu
d084c899d9
Merge "Fixed null callback issue" into qt-r1-dev
...
am: f3395734e8
Change-Id: I438b53eec3edf8de1f9046ea820f7fdfd17f4249
2019-08-20 10:51:22 -07:00
Jayachandran Chinnakkannu
0a1f1e0389
Merge "Fixed null callback issue" into qt-r1-dev
...
am: f3395734e8
Change-Id: If431a32bf6a44235599737b0295d2bb1cf491acf
2019-08-20 10:50:30 -07:00
Nathan Harold
a9e34e367f
Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev
...
am: a9df8f6993
Change-Id: I67052710756bf91f965c874cb3e42c8b531a1a51
2019-08-19 17:24:27 -07:00
Nathan Harold
a9df8f6993
Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" into qt-qpr1-dev
2019-08-19 23:58:38 +00:00
SongFerng Wang
bfc0a8de45
Merge "Extends carrier config KEY_5G_ICON_CONFIGURATION_STRING to support more scenarios." into qt-qpr1-dev
...
am: 052a08bcda
Change-Id: I48b5d230015a4d61556fda1f4bd65681136c12d7
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
Jack Yu
09ef1cb126
Fixed null callback issue
...
Fixed the vendor data/network service non-responsive
issue. The callback binder passed from frameworks
might be GC'd so that vendor data/network service skipped
calling the callback. This eventually caused data
connection state machine messed up.
Fixed by turning the weak refernce to the callback into
a strong reference. This ensure the binder alive when
vendor service needs to invoke the callback.
Test: Telephony sanity tests
Bug: 139076980
Change-Id: Ica0b7b810ffd5416ffd1b2b61f7ebc4af0dcb8ce
2019-08-19 10:02:11 -07:00
Leland Miller
b6d51f117b
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183 am: 4e16f07ddf
...
am: ecd1d67584
Change-Id: I4193a4f3f6b10d41c4ae3049d6d9267fc9daa778
2019-08-19 08:36:26 -07:00
Leland Miller
ecd1d67584
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183
...
am: 4e16f07ddf
Change-Id: I0e8a4e7cbe1bfc34f03b57256f6eed48f56ccdcc
2019-08-19 08:26:30 -07:00
Leland Miller
4e16f07ddf
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e
...
am: 6ef5b6c183
Change-Id: I602eafce4122063c07e6ff09f61f5ca43f47a0f4
2019-08-19 08:14:28 -07:00
Leland Miller
6ef5b6c183
Merge "Fix incorrect descriptions under SMS contract"
...
am: 8f48cb7e7e
Change-Id: I9b8659b91e72608100efbba3d36cb0b86066feb3
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
James.cf Lin
8f05cb6f19
Remove the Phone registration error notification
...
When the Phone registration status changes and back to
service, remove the Phone error notification automatically.
Bug: 136535506
Test: manual
Change-Id: I3ac19c09a37c4f62ddcf64e8660a7e925648f4dd
2019-08-19 10:35:35 +08: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
ff545cf558
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b am: 6cb0b46b2a
...
am: 9a5fea62c9
Change-Id: I3dbe01259b1eda95431b4ebea0880b31836d56b4
2019-08-15 15:22:59 -07:00
satayev
9a5fea62c9
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b
...
am: 6cb0b46b2a
Change-Id: I9ea46ce95161b5560cde7352d8a2464eb45f099d
2019-08-15 14:01:06 -07:00
satayev
6cb0b46b2a
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
...
am: 4a607da02b
Change-Id: I1516a6375c546f4af54984a4bff2ab2dcbc1783c
2019-08-15 13:39:04 -07:00
satayev
4a607da02b
Merge "Move telephony/cdma/ classes into appropriate package."
...
am: 46c04b7bb8
Change-Id: I1fb05b0e09c492fa95af92e6b146364492177f61
2019-08-15 13:18:41 -07:00
Jack Yu
b7c93a760a
Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a07
...
am: 1223d76203
Change-Id: I835f2f85881fcb8c39e4f6c4e0e5d781f6a35b50
2019-08-14 20:44:53 -07:00
Jack Yu
1223d76203
Merge "Added debug messages and watchdog" into qt-r1-dev
...
am: 24397e7a07
Change-Id: I64503d41665c9acefaeed02215e406bbc68f7ff5
2019-08-14 20:34:50 -07:00
Jack Yu
f14bf1ee93
Merge "Added debug messages and watchdog" into qt-r1-dev
...
am: 24397e7a07
Change-Id: I22a4a8e6599e46a0c3aba931af82bf98d7f48ece
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
ce95274ae6
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59 am: 7e3661be1e
...
am: a33d1aed85
Change-Id: Ie84519c8f26e3226e01913aba98a2954a970fef7
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
Change-Id: Id3ed1606bed208b8da758c3f86eadf1ccf6563cf
2019-08-13 17:21:23 -07:00
Brad Ebinger
7e3661be1e
Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e
...
am: c64c204f59
Change-Id: I4102629a798cbf520965a0141d8e89d5e87fa756
2019-08-13 16:51:51 -07:00
Brad Ebinger
c64c204f59
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
...
am: 4204a6017e
Change-Id: I3c10e76be4266bb4f43306ca3f0c7362499208f7
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
360363dcf7
Merge "[AT&T] Add key to show 4g for 3g RAT." into qt-r1-dev am: d7a23cc714
...
am: 0e3973b1b0
Change-Id: I0d96fc5ab4d893d94ea33cbf725df330aa1425ba
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
Change-Id: If7cfcd1d1ab3846bff9b941a2b13d16d9f415a3f
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
Change-Id: I6ac937185796a11cba2efe513877ed330915290a
2019-08-13 12:07:31 -07:00
Nathan Harold
3bdc7e4c62
Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE
...
Explain that once a country signal is lost, the broadcast
will be delayed for some time until we are confident that
we have lost visibility to any country (unless we detect
a new country).
Bug: 136036974
Test: make offline-sdk-docs (docstring-only change)
Change-Id: I29536ca2d60968405bb476a97dfbda69487c0013
2019-08-13 11:43:27 -07:00
Leland Miller
433441998b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8 am: 568f8bff01
...
am: 6d4e65a34b
Change-Id: I7ae98b2e2f158aa8929ffa6bcff90a7bc6a7f47b
2019-08-12 19:04:44 -07:00
Leland Miller
6d4e65a34b
Merge "Add documentation for Locked Messages" am: 3e85da2d89 am: 332f0a4ae8
...
am: 568f8bff01
Change-Id: I452eddd8d8d8abe29775f90e27cafd9b16ab820a
2019-08-12 18:43:35 -07:00
Leland Miller
568f8bff01
Merge "Add documentation for Locked Messages" am: 3e85da2d89
...
am: 332f0a4ae8
Change-Id: I44092dddb460050a7598ed00f14154d534a98f51
2019-08-12 18:32:08 -07:00
Leland Miller
332f0a4ae8
Merge "Add documentation for Locked Messages"
...
am: 3e85da2d89
Change-Id: Ie2ada062645c674ef35b386272a592f36e1485ee
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
3ddda4234a
Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev
...
am: 8a66dd0357
Change-Id: Ic9f6ec084e99e20fdc9cd1ea2955482709b59fa5
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