Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lais Andrade
efd27a83f5 Merge "Fix typo on View.verifyDrawable method javadoc" 2020-08-05 11:52:34 +00:00
Lais Andrade
50ef151f8b Fix typo on View.verifyDrawable method javadoc 
Fix: b/157335615
Test: N/A, only changing documentation
Change-Id: I30f869bdaac5fb6b87ea56a4416e619b46565113
 2020-08-05 08:20:08 +00:00
Mark Chien
26d2720b6f Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: 08feabb384 am: 3743623e44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: I209007d8742ac5a331b2b19af164944f38ac36ca
 2020-08-05 06:54:40 +00:00
Mark Chien
3743623e44 Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab am: 08feabb384 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
 2020-08-05 06:36:36 +00:00
Mark Chien
08feabb384 Merge "Allow wifi p2p to use legacy dedicated address" am: 5063505fab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9
 2020-08-05 06:22:38 +00:00
Mark Chien
5063505fab Merge "Allow wifi p2p to use legacy dedicated address" 2020-08-05 06:01:37 +00:00
James Wei
7ac1d04720 UsbAccessory: 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: I2650d273d7959e9cbe00518b364e57d0084abd92
 2020-08-05 03:24:46 +00:00
markchien
c09b057fb6 Allow wifi p2p to use legacy dedicated address 
Some exsting applications may expect wifi p2p use legacy
"192.168.49.1/24" address. Have a configuration for wifi p2p to
decide whether to use legacy dedicated address or random address.

Bug: 161520826
Test: atest TetheringTests
Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
 2020-08-05 11:03:46 +08:00
Paul McLean
79de4d7ec9 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

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
Merged-in: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
 2020-08-04 23:32:44 +00:00
Bill Yi
25b065f746 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c710e6f333 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308768

Change-Id: I8a3bf4972a6093bad42bc36d949dbe2d33147d9c
 2020-08-04 23:28:58 +00:00
Christian Wailes
bafa9fb77e Merge "Rename blacklist to denylist" into rvc-dev-plus-aosp am: 47c5c8d1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12286466

Change-Id: I32bf6f846df71614413cd0846547bca2b070eda1
 2020-08-04 22:05:17 +00:00