92 Commits

Author SHA1 Message Date
Bill Yi
b53971b8d6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: Ifcf4b8c7138eef6ee513797b51a8d012880b0718
2017-11-29 22:07:25 -08:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Bill Yi
93bc690c54 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I8a20f1539abd7c79ba8ac37eb6303a43ecdea348
2017-10-19 20:31:20 -07:00
Chen Xu
4282470d84 Merge "Fix Crash CarrierDefaultApp due to exception" am: 0ec2348b85 am: 9d2c715d37
am: b20b5cc812

Change-Id: Ifb7fa6ccf70b0835c52716577a2f335e30c02b9a
2017-09-07 21:48:20 +00:00
Chen Xu
9d2c715d37 Merge "Fix Crash CarrierDefaultApp due to exception"
am: 0ec2348b85

Change-Id: I04f22351f158fb6db7ba62f680b8730fd8324f1f
2017-09-07 21:09:54 +00:00
Chen Xu
0ec2348b85 Merge "Fix Crash CarrierDefaultApp due to exception" 2017-09-07 20:59:03 +00:00
fionaxu
a4434f86a0 fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.

Test: manual test with cold and hot TMO SIM
Bug: 62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
2017-09-07 18:49:55 +00:00
Qiongcheng Luo
fd11ce5faf Fix Crash CarrierDefaultApp due to exception
[Issue]
CarrierDefaultApp crashes due to null pointer exception.

[Cause of defect]
To call mUrl.toString() even if mUrl is null and mUrl is already
checked if it is null just before.

[How to fix]
Check the null status of mUrl when call its toString() method.

Bug: 65393337

Change-Id: I4b4b1f125aac7e30ca18be22d7adc358cab83b2f
2017-09-07 15:40:09 +09:00
fionaxu
f30414e02a Merge "use simOperator name in the notification" into oc-mr1-dev
am: 277689d81c

Change-Id: I7463fb65b5553772d57b4538ed1aba614a4f47bf
2017-09-01 23:51:47 +00:00
TreeHugger Robot
277689d81c Merge "use simOperator name in the notification" into oc-mr1-dev 2017-09-01 23:35:20 +00:00
fionaxu
7569cc2e06 use simOperator name in the notification
today we are using getNetworkOperator for carrier's name in the
notification which might be misleading in cases users romaing on
different network.
as today there is no reliable way to get carrier's name, we will use
getSimOperator and if that returns empty string, fallback to 
networkOperatorName. In the long term, we can use better wording if 
simOperatorName is unknown.

Bug:65251050
Test: Manual
Change-Id: I6ffc37f8cc8e686d2e884283be2006cf704e8c64
2017-09-01 21:08:05 +00:00
fionaxu
7ce265196d Merge "reloading the current page on Network lost->avail" into oc-mr1-dev
am: 3f9faf6df4

Change-Id: I64d4590fdd983885d8ad2f66178e40724c5235c8
2017-09-01 19:06:16 +00:00
TreeHugger Robot
3f9faf6df4 Merge "reloading the current page on Network lost->avail" into oc-mr1-dev 2017-09-01 18:54:49 +00:00
fionaxu
1c0a86fc6e reloading the current page on Network lost->avail
if suddenly lost network on captiveportal page, we didnt recover
gracefully when network become available. we should reload the current
page on network available.

Bug: 65041224
Test: Manaul
Change-Id: I356dbf73ef3ce9788883bf6561929d961c3a6888
2017-08-31 15:36:33 -07:00
Bill Yi
f9d96b967f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666
2017-08-29 19:04:00 -07:00
Bill Yi
d948b56b23 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I43683d9425dd5bde8c9e4ce3503136cb825cd290
2017-08-15 14:19:07 -07:00
fionaxu
9e3413d416 Merge "app link handling under restricted mobile data" into oc-dr1-dev am: 93bf6200eb
am: aa73a69d3a

Change-Id: Idbfec034c44a355ddcf702bbfffea8107a48f702
2017-08-08 09:08:42 +00:00
fionaxu
aa73a69d3a Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35
2017-08-08 09:02:26 +00:00
fionaxu
a40b8b7431 Merge "app link handling under restricted mobile data" into oc-dr1-dev
am: 93bf6200eb

Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
2017-08-08 09:02:23 +00:00
TreeHugger Robot
93bf6200eb Merge "app link handling under restricted mobile data" into oc-dr1-dev 2017-08-08 08:57:16 +00:00
Bill Yi
bc8dbd6020 Import translations. DO NOT MERGE
Change-Id: I84ca884466c9fbd5489c7f47b0518fd336306099
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 15:09:48 -07:00
Bill Yi
5f17306bac Import translations. DO NOT MERGE
Change-Id: I5ed3fe6e64b2ac5bec9e451e9e1797e6bea8031b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 01:09:59 -07:00
Bill Yi
38037535e4 Import translations. DO NOT MERGE
Change-Id: I53239157d82bf33503972713fe1657e2295aa526
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 00:30:33 -07:00
fionaxu
d60a9d0e58 app link handling under restricted mobile data
1. new actions to allow default carrier app dynamically enable/disable
app-link filtering
2. new intent to notify registered carrier apps of other default
networks
3. signal-to-actions config to sepcify carrier actions on default
network change
default network available -> disable intent filter for app-link
defaut network lost -> enable intent filter for app-link
4. new carrier actions to allow carrier apps to register/unregister
other network status dynmacially

Bug: 62487488
Test: Manual
Change-Id: Ie9fa9f3f4ca38f9f26a90a3dbf95f7f20a8ad773
2017-08-04 18:13:12 -07:00
Chen Xu
f70945be53 Merge "proper cleanup onDestroy" into oc-dr1-dev
am: c8f40de2dd

Change-Id: I41cd5388f08bdb400616d4e459db04353cf37915
2017-07-25 01:37:15 +00:00
Chen Xu
5f5304fe21 Merge "proper cleanup onDestroy" into oc-dr1-dev
am: c8f40de2dd

Change-Id: Ibf067cbbb041d0f0e79afbe554438d571f9a8d3e
2017-07-25 01:14:12 +00:00
fionaxu
f62e4cc565 proper cleanup onDestroy
1. interrupt the sleeping testing thread onDestory to avoid
any thread keep running after onDestory.
2. add check of isFinishing() or isDestoryed() when the
testing thread wakeup.
3. detory the webview onDestory since there're chances that
some callbacks in WebChromeClient will try to open dialogs
while the container activity has been destroyed.

Bug: 63819703
Test: Manual test
Change-Id: Ida62d9d8e97e8c9f905ce2feab4ea265575baee8
2017-07-24 15:43:27 -07:00
Chen Xu
41db5cf504 Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev am: 037503dfa0
am: 08bccd3b20

Change-Id: I2b874710bada51620eb55d8357e39e68c7088a79
2017-07-10 21:09:27 +00:00
Chen Xu
08bccd3b20 Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev
am: 037503dfa0

Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1
2017-07-10 21:00:27 +00:00
fionaxu
c457a04d93 fix cellular captive portal reevaluation url
we apply redirection link as the url everywhere for cellular captive portal.
this url should only be used when load the portal page at the first place (when users
click on the notification) and shouldn't be used as the re-evaluation url
as it wont return the expected response code.
instead we should use special URL (generate_204) from connectivity
service which will return 204 if redirection is gone.

Test: manual test with cold and hot TMO SIM
Bug: 63351490
Bug: 62532802
Change-Id: I56bb03a58447c5c46758e692ff357d540ea4cd7b
2017-07-10 18:27:03 +00:00
Bill Yi
eafb4c0e37 Import translations. DO NOT MERGE
Change-Id: I3230b75c983b5ee9db8255d263240769d2fb82aa
Auto-generated-cl: translation import
2017-06-30 22:36:19 -07:00
Bill Yi
4655f36913 Import translations. DO NOT MERGE
Change-Id: If7f8b590d878dfbd97565b52d6353682221a2b39
Auto-generated-cl: translation import
2017-06-12 11:47:44 -07:00
Bill Yi
beded08d87 Import translations. DO NOT MERGE
Change-Id: I04a1ca378526cb10c0b162dda12264747b96fbcc
Auto-generated-cl: translation import
2017-06-12 11:43:41 -07:00
Bill Yi
bb39a82705 Import translations. DO NOT MERGE
Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import
2017-06-09 17:44:49 -07:00
fionaxu
670e35b3af new strings to support vzw roaming feature
Bug: 62304495
Bug: 36193933
Test: Manual
Change-Id: I50667dda225e64464a28aa79db2efb6ed4fa7390
2017-06-02 18:18:21 -07:00
Chen Xu
45c62922aa Merge "support horizontal scroll and zoon for webview" into oc-dev am: be0078f018
am: 359afde183

Change-Id: I2b73cc33e09d29a2ae2b92a5d96ccb2840ddf2cf
2017-05-11 05:09:49 +00:00
Chen Xu
359afde183 Merge "support horizontal scroll and zoon for webview" into oc-dev
am: be0078f018

Change-Id: I9f253695288ffdc4b134e47ae0fd2cd8ed0296be
2017-05-10 23:50:17 +00:00
fionaxu
2e0915f143 support horizontal scroll and zoon for webview
Bug: 37913717
Test: Manual test for horizontal scroll
Change-Id: I97f19030ae034910c8d6f3e23634f55d43ab6589
2017-05-08 11:57:41 -07:00
Chen Xu
4078f993ba Merge "support locale change for notification channels" into oc-dev am: dd373a838d
am: 7f9b31601e

Change-Id: Iade3dd57f046908e0b4031b5f7a87dd5c1240909
2017-05-03 16:58:23 +00:00
Chen Xu
7f9b31601e Merge "support locale change for notification channels" into oc-dev
am: dd373a838d

Change-Id: I7773fb08018925589a271baccf35ce3d9cb3c7b7
2017-05-03 16:47:09 +00:00
Chen Xu
dd373a838d Merge "support locale change for notification channels" into oc-dev 2017-05-03 16:42:50 +00:00
fionaxu
92d759d56a support locale change for notification channels
Bug: 37911731
Test: Manual test with different languages
Change-Id: I36ce985dfc8fdb0f6c2b8b20c411b63099942f44
2017-05-02 18:17:20 -07:00
Bill Yi
dd0ef0785e Import translations. DO NOT MERGE
Change-Id: Ia4c823c422b885e56a8225ab82dab57259892f32
Auto-generated-cl: translation import
2017-04-29 20:35:55 -07:00
Bill Yi
cb329cf170 Import translations. DO NOT MERGE
Change-Id: Iafadab9c947745e67c3a904cc0720860952c88ea
Auto-generated-cl: translation import
2017-04-29 09:25:03 -07:00
fionaxu
3ec0d46515 Merge "Merge "new reset carrier signals/actions" am: 5bd39aaf42 am: dc31a45517 am: 89b525afb3" into oc-dev-plus-aosp
am: 1cf64c2ad8

Change-Id: I7924dea822f1d6a0ceb618390818cd358199cf00
2017-04-27 23:39:58 +00:00
fionaxu
e9f3f965c8 Merge "new reset carrier signals/actions" am: 5bd39aaf42 am: dc31a45517
am: 89b525afb3

Change-Id: Idcdfb7667b0db7b403bab38bcc24201a8eafe4ca
2017-04-27 23:12:12 +00:00
fionaxu
89b525afb3 Merge "new reset carrier signals/actions" am: 5bd39aaf42
am: dc31a45517

Change-Id: I59b456a4e849900080cc0564b096e6dacf7070ae
2017-04-27 23:02:23 +00:00
fionaxu
77f466d8f6 new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Merged-in: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
2017-04-27 14:09:57 -07:00
fionaxu
982799eb08 new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
2017-04-27 11:07:54 -07:00
Bill Yi
6053a3af29 Import translations. DO NOT MERGE
Change-Id: I231c6c8609a64f510f3902840053fb056a7e8509
Auto-generated-cl: translation import
2017-04-21 02:42:01 -07:00