Commit Graph

530366 Commits

Author SHA1 Message Date
Chalard Jean
869d4f597d Merge "Add a test for starting the legacy VPN." 2020-08-06 12:50:50 +00:00
Josh Hou
6aac86eed5 Allow call forwarding number with prefixes to be dialed while on IMS roaming
If the carrier supports call forwarding number prefixes to be allowed
while on IMS roaming, then the number should be dialed and forwarded successfully

Bug: 153413483
Test: Verify the call using *72 <number to be forwarded to> is dialed and forwarded successully
Change-Id: Ia93dec2ebb11aa3ab8f48975a9b6f02089d1482b
Merged-In: I6cd1e60e0dbb634581c97552dad244383ff4e3f9
2020-08-06 16:55:48 +08:00
Chalard Jean
197b4a7168 Resolve the endpoint in legacy VPN
This adds code to resolve the endpoint in the legacy VPN
runner if it was specified as a hostname, and enables the
previously added test that was disabled because this was
broken until this patch. See the linked bug for details.

This patch uses the async DNS API to do the resolution.
This lets the resolution be fully cancellable, though the
code is more complex than with the non-interruptible
getByName.

Test: VpnTest and in particular VpnTest#testStartRacoon
      Fixes the test meant to test this
      Also manual testing that resolution of a real
      hostname works as expected, that failure to resolve
      returns correctly, and that cancellation/interruption
      will unblock the thread and terminate immediately.
Bug: 158974172
Change-Id: I714985f3c7919dad9c1854830c50f29c1f94a21e
2020-08-06 17:29:59 +09:00
Chalard Jean
b2a73dc872 Add a test for starting the legacy VPN.
The legacy VPN has, among many parameters, a host to connect to.
This host can be specified as a numeric address, or as a hostname.
When it's a name, resolution is required. Currently, name
resolution is performed by the native VPN daemons racoon and
mtpd. When a hostname is used, the framework does not know the
IP address of the VPN server and does not add a throw route for
the VPN server IP address. On older kernels this does not matter
because the legacy PPP kernel code binds the PPP socket to the
right network, but on newer devices that use the upstream PPP
code, this does not work. See b/133797637.

This patch instruments the legacy VPN code so that it can be
run in tests, and uses this instrumentation to simulate passing
a configuration that contains a host, and verifies that the
arguments passed to the mptd and racoon daemons receive the
expected server address, and that the expected throw route is
correctly installed.
It then adds two tests : one specifying the server as a numeric
address, and one as a hostname. As the resolution is currently
broken, the latter of these tests is added disabled, and the
followup fix to the issue enables it.

This test is basic and very targeted, but it's what we need right
now. Also there are plans to remove this entire code path in S, so
the test being ad-hoc is not much of a problem.

Test: this
Bug: 158974172
Change-Id: I420b63db03a58e8c67a98a85c9f4c2d6ed7ad078
(cherry picked from commit 45846a03051a13d667732288e457eab4336a691e)
2020-08-06 17:16:00 +09:00
Puma Hsu
15630c0b43 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: I1eeee50e4c67ed176d464ef7252adac9fb99c31f
2020-08-06 06:13:51 +00:00
Bill Yi
aa78645d74 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4efc1a23c45bbff500fe38afbbea32d7f0b172b9
2020-08-06 04:22:35 +00:00
Wayne Lin
5b908d36a3 Merge "Extend SUPL network request timeout for consecutive SUPL request" into rvc-d1-dev am: db9c531910
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279987

Change-Id: Icd6c812e9ad22a4bd84602837ec6fd1435b1c5ff
2020-08-06 04:13:14 +00:00
Wayne Lin
db9c531910 Merge "Extend SUPL network request timeout for consecutive SUPL request" into rvc-d1-dev 2020-08-06 03:51:14 +00:00
James Wei
6549bf6d3d Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382397

Change-Id: I8696f0cdad5ada3040a46638fe964f394ae08dbb
2020-08-06 01:41:21 +00:00
Chavi Weingarten
1812833eb2 Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev am: 15e6f37a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308823

Change-Id: I49889d6e90ed4d8ce33ca773eeeb3ab7e4a43924
2020-08-06 01:39:49 +00:00
Chavi Weingarten
15e6f37a16 Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev 2020-08-06 01:16:23 +00:00
James Wei
3c127a54bb Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" 2020-08-06 01:12:04 +00:00
Xin Li
4939ba29f5 Merge "Merge QQ3A.200805.001" am: 4b3c00e75f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434

Change-Id: I12420dd6aa080e632f4e3b2748b4970450a4ee72
2020-08-05 21:19:12 +00:00
Steve Elliott
b0e7b88525 Mark implicit PendingIntents as immutable am: 504e7d848d am: 46387fb17b am: 78c2d2ca94
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296465

Change-Id: Ic3d883d4effd8e01c950c8554aba670894a5e634
2020-08-05 21:17:11 +00:00
Xin Li
4b3c00e75f Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Steve Elliott
9058493863 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 am: ec741cf6d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I1464de0775bfcabc551d460b2067efec6f7d475e
2020-08-05 20:55:06 +00:00
Steve Elliott
438c8773b0 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 am: 347ec93c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I10dfcdb8b4f1a200c5b42b6dd817ee19f9569d40
2020-08-05 20:54:34 +00:00
Steve Elliott
54d2facd6a Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc am: a64978fe65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: Ib48040920db7db292bf76ee1f1fca0953c47177a
2020-08-05 20:54:14 +00:00
Steve Elliott
1af73a8535 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 am: 6cb8e4a157
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I54690b174f1c16cd008b79389efb02337bc43809
2020-08-05 20:53:23 +00:00
Steve Elliott
325c62d876 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 am: cff7b95c37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: Ife9c19be5da3172769cfa261ba7adb772f58550d
2020-08-05 20:53:14 +00:00
Steve Elliott
0288878d81 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc am: 205fd265d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I8f1753f75e2597bb434fb580e8b625716efca07d
2020-08-05 20:53:03 +00:00
Steve Elliott
ec741cf6d2 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I0836135d575492f638248350e7811aad05a618bf
2020-08-05 20:52:47 +00:00
Steve Elliott
6cb8e4a157 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I97946675a0cad34c0e6852ac4c28e8a7f8096c5a
2020-08-05 20:52:35 +00:00
Steve Elliott
78c2d2ca94 Mark implicit PendingIntents as immutable am: 504e7d848d am: 46387fb17b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296465

Change-Id: I8064774a2e30a08ddf017804fa08c9f97f080d26
2020-08-05 20:52:02 +00:00
Tyler Gunn
c59fd0cd80 Improve remote connection logging.
This CL improves traceability of calls initiated via a remote connection
service.
For regular incoming/outgoing calls, when initiating a request to create
a remote connection in RemoteConnectionService, we set
EXTRA_REQUESTING_PACKAGE_NAME in the parcelled request to the package name
of the connection manager.  In ConnectionService this serves as an
indicator that the incoming request is via a connection manager and is
used to trigger setting of EXTRA_REMOTE_PHONE_ACCOUNT_HANDLE with the
phone account handle the remote connection service uses to place the call.
For conferences and existing connections, the initial request is from
the remote connection service to the connection manager so we can
just set the EXTRA_REMOTE_PHONE_ACCOUNT handle there directly.

Also cleaned up logging in the telecom session logging to remove the
assumption that the ownerInfo is an incall service.

Test: Manual testing with connection manager to verify logging.
Bug: 154353494
Fixes: 155097158
Merged-In: I916750e0f558db1eb9e581bab7a9fbc71f781709
Change-Id: Iee1b5cfd3334a5de08d7b04022b7c6d5af6a4b04
2020-08-05 13:45:33 -07:00
Steve Elliott
3ff2a5cbd1 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: Ic0d9e93413dc96be874ff7de5d818db1b20ec24e
2020-08-05 20:37:35 +00:00
Tyler Gunn
893a602e61 Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable.
The API contract for createLaunchEmergencyDialerIntent indicates that
the return value is @NonNull, however the code clearly can return a null
value if either:
1. Telecom is unavailable.
2. There is a remote exception.

Since the API just returns a new ACTION_EMERGENCY_DIAL intent with the
package name of the emergency dialer (from Telecom string resources), we
can provide a reasonable fallback behavior by just returning a new
ACTION_EMERGENCY_DIAL intent with no targeted package.  The system will
still launch the emergency dialer in this case, but if there is a scenario
where multiple emergency dialers are installed on a device, the AOSP one
may get launched instead.  This is, however, better than there being NO
emergency dialer launched.

Test: Comment out call to Telecom service and verify the AOSP emergency
dialer still launches.
Bug: 152187752
Fixes: 155097434
Merged-In: I1665d456dace8e41cc035e792f319d98dd07219c
Change-Id: I06f8a5bebace5b22822f7bb714e14915126b904f
2020-08-05 13:37:27 -07:00
Steve Elliott
cff7b95c37 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I735f5f35f4951fa39689594240cfc63e1ca12fe9
2020-08-05 20:26:36 +00:00
Steve Elliott
205fd265d0 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I6eeeade5c75601576d89b31e5a968145e330b52f
2020-08-05 20:26:25 +00:00
Steve Elliott
347ec93c0e Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: Ibd97acf470e3a638fbf7617be6e6ab3ec66734bc
2020-08-05 20:26:22 +00:00
Steve Elliott
a64978fe65 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I610bb89c74617468df9ead099fb7c9fab1680b98
2020-08-05 20:26:08 +00:00
Steve Elliott
55676b89da Mark implicit PendingIntents as immutable am: a5d52884d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296466

Change-Id: I91705c47fe73f91655aafd62b9ea44306fde0302
2020-08-05 20:25:52 +00:00
Steve Elliott
46387fb17b Mark implicit PendingIntents as immutable am: 504e7d848d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296465

Change-Id: Ia61f61355f4c6db4474d25ac50fdd535df67b764
2020-08-05 20:25:52 +00:00
Steve Elliott
fa64ffd0a2 Mark implicit PendingIntents as immutable am: 599c3e4b75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I97e44abd90dd662e53443e0d8eb6535fdaaea877
2020-08-05 20:25:51 +00:00
Steve Elliott
ae567e56d8 Mark implicit PendingIntents as immutable am: 7f0fd285c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I29e112de4bcc44c0d2dc5245e66c0b5bff04a216
2020-08-05 20:25:43 +00:00
Steve Elliott
e35ad478dc Merge "Mark implicit PendingIntents as immutable" into rvc-dev 2020-08-05 20:08:37 +00:00
TreeHugger Robot
6a4d212454 Merge "Update language to comply with Android’s inclusive language guidance" into rvc-dev-plus-aosp am: ee4e5355bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308260

Change-Id: If4fa13f2b471943f9cf9624ff9089ef6b6bdb628
2020-08-05 20:01:11 +00:00
TreeHugger Robot
ee4e5355bf Merge "Update language to comply with Android’s inclusive language guidance" into rvc-dev-plus-aosp 2020-08-05 19:43:10 +00:00
Christian Wailes
c044cd9bb1 Merge "Rename blacklist to denylist" am: 0f2d849c39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680

Change-Id: I99177c0a228d6f07dd72b3c9625cfb80a4893f11
2020-08-05 17:48:02 +00:00
Xin Li
da7d27b21e Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Change-Id: Idbcffbd09045575e92297fd6e0071a56a4e3cbae
2020-08-05 17:40:02 +00:00
Christian Wailes
0f2d849c39 Merge "Rename blacklist to denylist" 2020-08-05 17:32:00 +00:00
Treehugger Robot
ff642c408c Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724

Change-Id: I32f6e92956fc98e60691483f9a6905bbce25c74e
2020-08-05 16:47:03 +00:00
Andrei Onea
6be88efde5 resolve merge conflicts of c94e810cab to rvc-dev-plus-aosp
Change-Id: I47128585a8259dc51f25d679d1841578138f9a1d
2020-08-05 17:42:55 +01:00
Treehugger Robot
830c70ad25 Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" 2020-08-05 16:23:51 +00:00
Wayne Lin
eaae63437f Extend SUPL network request timeout for consecutive SUPL request
Extend timeout more than telephony retry timer to prevent CS release 2nd request before retry.

Bug: 159772456
Test: Consecutive emergency NI SUPL test, emergency NI SUPL test with/without SIM and SI SUPL test
Change-Id: Ib3e1f394adda6c2c2eacc38df941cc5e9fd8370d
2020-08-05 13:19:51 +00:00
Andrei-Valentin Onea
c94e810cab Merge "Rename manual hidden api lists" am: f6d191c250
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382669

Change-Id: I62b261a0d977b97421293ac4f19221abc25fe6f4
2020-08-05 13:06:27 +00:00
Lais Andrade
388881b89a Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004 am: 655eb212ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: I73d69dc87da46acf1677d8c53d69f8f798a09fbe
2020-08-05 12:42:26 +00:00
Andrei-Valentin Onea
f6d191c250 Merge "Rename manual hidden api lists" 2020-08-05 12:42:18 +00:00
Lais Andrade
655eb212ec Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5 am: 8b8c8f1004
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: Ie8720fc2f94420e5d01b03047aa1579c46f8f203
2020-08-05 12:21:32 +00:00
Lais Andrade
8b8c8f1004 Merge "Fix typo on View.verifyDrawable method javadoc" am: efd27a83f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386078

Change-Id: I8153c4050fc5de3a1d206d030ebaddb9ff748a7b
2020-08-05 12:08:03 +00:00