Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,701 Commits 3 Branches 0 Tags
e0eb89cf664598a559b598601c2ff420f009ffc2
Commit Graph

18300 Commits

Author SHA1 Message Date
Benedict Wong
e0eb89cf66 Merge "Add shell VcnManagementService" am: fa2c588ab5 am: 1ee8f22e8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456942

Change-Id: I41d115e53d3b83c89695d860bca69d4f752a1e44
 2020-10-29 22:37:57 +00:00
Benedict Wong
e2dacc7411 Add shell VcnManagementService 
This patch adds a shell of the VcnManagementService and VcnManager

Bug: 163431877
Test: Compiles, Boots
Change-Id: I1f3d8ab9c9bff7d419ea6d3edaae3b6b41b1d775
 2020-10-27 20:09:06 -07:00
Treehugger Robot
0c6faf40fd Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 am: ed29b2da3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402

Change-Id: I57d108c24027a44fcadee9ee54c69df9696916c8
 2020-10-27 18:47:13 +00:00
JW Wang
125259951c Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 am: 68569ea618 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I229063cf0f85a110a15c9aa4dd6ca013f1c06a96
 2020-10-27 18:47:10 +00:00
JW Wang
167b921a80 Add #connectWithTimeout (1/n) am: 67c91c405c am: 4fba545a90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470700

Change-Id: Ib1d6e7967c63e1e3af632d1ca1760cba705f4a09
 2020-10-27 18:47:05 +00:00
JW Wang
b5f26d897d Let #getUiAutomation return null if UiAutomation fails to connect (3/n) 
Now #getUiAutomation returns null if the underlying UiAutomation fails
to connect for targetSdkVersion > R. This gives the caller a chance to
retry and decide when to give up.

Bug: 147785023
Test: presubmit
Change-Id: Ibf201fa042b80c067f2a0c3b0bde23adf9c60546
Merged-In: Ibf201fa042b80c067f2a0c3b0bde23adf9c60546
 2020-10-27 16:32:19 +00:00
JW Wang
0c56d28a19 Allow #disconnect to be called safely on connection timeout (2/n) 
Now #disconnect won't throw if the previous #connect failed due to
timeout. Note we also introduce generation id so we won't receive
notifications or modifications from the previous client to disrupt
UiAutomation's status when making the next connection.

Bug: 147785023
Test: m
Change-Id: Idf77207124494bd78770b8ea5d9ac4b1fd1a490a
Merged-In: Idf77207124494bd78770b8ea5d9ac4b1fd1a490a
 2020-10-27 16:31:43 +00:00
JW Wang
67c91c405c Add #connectWithTimeout (1/n) 
Add #connectWithTimeout which allows us to specify the timeout before
giving up the connection. The method throws a TimeoutException so the
caller can catch it and retry connection again.

Note we don't change the exception spec. of #connect in order to be
source and binary compatible.

Bug: 147785023
Test: m
Change-Id: I5ac61ed0aef107f4e38166c0b95bc3a3fb419387
Merged-In: I5ac61ed0aef107f4e38166c0b95bc3a3fb419387
 2020-10-23 15:23:01 +00:00
Anton Hansson
14897c256d Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
 2020-10-20 19:45:04 +00:00
Anton Hansson
dd7d52f963 Remove @TestApi from @SystemApi symbols 
I ran these commands:
    cd frameworks/base
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'

Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
 2020-10-19 16:41:01 +01:00
Charles Chen
1bb9fbbac3 [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: 1e0cf0c900 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011

Change-Id: I34c9cd32c258445c8d7f1d5815cc1f55325a8eef
 2020-10-16 18:56:25 +00:00
Charles Chen
1e0cf0c900 [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011

Change-Id: I174d70795eae849ca346fb79528e418a5003f76a
 2020-10-16 18:39:01 +00:00
Treehugger Robot
9ab252e8ed Merge "Do not send WTF when ETHERNET_SERVICE" am: f03005d5e0 am: e7e458954c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458804

Change-Id: I7e06f19d39feb659a7345160db443059e4a69912
 2020-10-14 01:24:26 +00:00
Makoto Onuki
b547383444 Do not send WTF when ETHERNET_SERVICE 
Not all devices have the ETHERNET_SERVICE service, which is expected,
so do not send WTF even when it's not available.

Fix: 169024836
Test: Build

Change-Id: Ia1fa2d1753aa40e1d09996be11082d65afc5458f
 2020-10-13 13:17:31 -07:00
Charles Chen
c947b10f99 [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" 
This reverts commit ae03031efe.

Reason for revert: Merge the reverted patch by accident.

Bug: 162627132
Change-Id: Ic2f072730050cb47926cec6ed24af7ef9e5e7055
 2020-10-13 01:14:25 +00:00
Linus Tufvesson
2e33ba4687 Update javadoc for setLaunchDisplayId am: 334190f26e am: c37e102250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770

Change-Id: I3d140d6f77e5600179f20fd84031e0a2c389b3ed
 2020-10-09 21:42:02 +00:00
Treehugger Robot
a95dc0e13f Merge "Fix non-inclusive terms in framework device policy logic" am: 64add27a7c am: 3d3e16e2a6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454737

Change-Id: I4a64cac98249a47797d2b3c4f937559f4f681261
 2020-10-09 17:19:43 +00:00
Linus Tufvesson
334190f26e Update javadoc for setLaunchDisplayId 
.. to match behavior post I1f9662c2bd14b34e00fbc8ebb926538f0329c37a

Bug: 167593637
Test: Javadoc change only.
Change-Id: I4cb9fe4a5ae74b1474f9da39b6aeb3a374f8cf12
 2020-10-09 09:54:40 +00:00
Rubin Xu
d40199b5b2 Fix non-inclusive terms in framework device policy logic 
Bug: 170188829
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Merged-In: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18
Change-Id: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18
 2020-10-08 14:22:47 +00:00
Pinyao Ting
c4f2ea4b87 Fix the issue provider can be wrong when requesting slice permission am: e3eba1322b am: df8bc34ba6 am: 0726759259 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12687714

Change-Id: I315091bf76fb38fad002e68304b124524105f657
 2020-10-05 23:46:38 +00:00
Pinyao Ting
df8bc34ba6 Fix the issue provider can be wrong when requesting slice permission am: e3eba1322b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12687714

Change-Id: Ie3fefe8638c85c5b887b62612cfd5c5a338b827b
 2020-10-05 23:01:26 +00:00
Charles Chen
fb1170dc82 [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: 6c079ef0b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: If160b7e93e79cd73468cbbdb2df614ccb7ab45c8
 2020-09-29 06:35:44 +00:00
Charles Chen
6c079ef0b5 [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12716107

Change-Id: If1a42b8cd7cab0c97f45fc3f452dbe4bc054cf41
 2020-09-29 06:17:52 +00:00
Charles Chen
5c393cb830 Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev 2020-09-29 05:59:59 +00:00
Charles Chen
ae03031efe [RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" 
This reverts commit f21c885ca7.

Reason for revert: Have regression b/168268396.
Needs to pull out from Nov. builds.

Bug: 162627132

Change-Id: I29fa3937d1655a0cc7591abcfa2067f4fb2b2bcb
 2020-09-29 03:21:52 +00:00
Pinyao Ting
e3eba1322b Fix the issue provider can be wrong when requesting slice permission 
SlicePermissionActivity reads provider_pkg from intent, which can be
modified at will. As a result user might see incorrect package name in
the dialog granting slice permission.

Bug: 159145361
Test: manual
Merged-In: I8b66c02786df4096dad74b7e76255d5ddd1d609d
Change-Id: I8b66c02786df4096dad74b7e76255d5ddd1d609d
(cherry picked from commit 0ad32a2d70)
 2020-09-24 19:06:07 +00:00
Jeff Sharkey
741c0a78cc Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
 2020-09-14 23:10:42 +00:00
Jeff Sharkey
c0b288133a Merge changes from topic "sep11" 
* changes:
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
 2020-09-14 21:52:13 +00:00
Treehugger Robot
1d3e694b97 Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I70eb21c1ea9411974a1c07f6aaaf611760110c34
 2020-09-14 21:27:14 +00:00
Julia Reynolds
71c18d2afc Replace 'whitelist' with 'allowlist' 
Change-Id: If7422064e59e6c055c9dae092ead298b81cf41e8
Test: atest
Bug: 161889253
Merged-In: I94a43c1c995052b034d8a5377786e1a15e4c9c59
 2020-09-14 18:29:23 +00:00
Jeff Sharkey
a8cec413b6 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
 2020-09-14 10:00:07 -06:00
Jeff Sharkey
16dd960d6f Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
 2020-09-14 10:00:05 -06:00
Jeff Sharkey
6516a83886 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Ifce5239991e3b78dd4757712e3b88093ad7161f0
 2020-09-14 10:00:02 -06:00
Jeff Sharkey
705f6bec2d Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e
 2020-09-14 09:59:01 -06:00
TreeHugger Robot
1ed53ed94e Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512483

Change-Id: Ief6065688eb49cd0d795dbd892ea9bfa76290f2b
 2020-09-10 00:20:15 +00:00
TreeHugger Robot
ceb7aefd6f Merge "Sanitize more of the notification text fields" into rvc-dev 2020-09-09 23:55:10 +00:00
TreeHugger Robot
c0f911ce35 Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12287404

Change-Id: Ifeaf09fda00fe2622ead045dc4f6f93c5129e5fc
 2020-09-04 10:40:39 +00:00
Julia Reynolds
a19f9ed2b1 Sanitize more of the notification text fields 
Test: manual; monitor SystemUI performance when an app tries to
post a messaging style notification with messages with long text
Bug: 158304295
Bug: 147358092

Merged-In: c953fdf6bc
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6bc)
 2020-09-03 19:42:23 +00:00
Julia Reynolds
8061246d4a Sanitize more of the notification text fields 
Test: manual; monitor SystemUI performance when an app tries to
post a messaging style notification with messages with long text
Bug: 158304295
Bug: 147358092

Merged-In: c953fdf6bc
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6bc)
 2020-09-03 19:39:55 +00:00
Xin Li
c8c8e8e8be Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
 2020-09-02 12:34:37 -07:00
Andrii Kulian
f21c885ca7 Require permission to create trusted displays 
Bug: 162627132
Test: atest VirtualDisplayTest#testTrustedVirtualDisplay
Test: atest
frameworks/base/packages/SystemUI/tests/src/com/android/systemui/bubbles
Test: atest DisplayTest
Test: atest VirtualDisplayTest#testTrustedVirtualDisplay
Test: atest VirtualDisplayTest#testUntrustedSysDecorVirtualDisplay
Test: adb logcat -b events

Change-Id: Id06b2013ef5fdeadf321f14f8b611c733031d54d
Merged-In: Id06b2013ef5fdeadf321f14f8b611c733031d54d
 2020-09-01 13:22:29 +08:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
 2020-08-31 21:21:38 -07:00
Steven Moreland
96894457f7 Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 am: bf9f6b4f3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Ie9c4dafb0ac9ad965dd51b9b789d2d41a7606a5d
 2020-08-13 22:28:19 +00:00
Steven Moreland
1997524011 ApplicationLoaders: improve classloader cache errs 
When zygote preloads a classloader, but at runtime, a different one is
used, we get an error and fallback. This error is improved in the
following ways:
- print the zip name with the shared libraries, so we know which library
  the error is for
- distinguish cached from runtime dependencies in the error message
  itself

Bug: 163886868
Test: N/A
Change-Id: I3f4c4078e9eb05b83058982afc7b7ea0822d1257
 2020-08-13 17:07:34 +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
Treehugger Robot
a42c8fc0c1 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: Ic41fd85340530e59a02ce080bd3487e2a876a69e
 2020-07-31 22:19:09 +00:00
Michael Wachenschwanz
a57c974945 Update language to comply with Android’s inclusive language guidance. 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I6aac06e56507bb6ce69afd9b3db92be6b03a1400
Test: n/a
 2020-07-31 18:54:02 +00:00
Treehugger Robot
724c877357 Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 am: 9d67d59530 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378607

Change-Id: Ifb4996d7ccbb7e47da1bb1b8246fb5da94626d4c
 2020-07-30 17:12:24 +00:00
Nicole Borrelli
dd0406becb Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference


Bug: 161896447
Change-Id: I038fbac2bb59e97dc87f082eab98f3838263c909
 2020-07-29 22:31:37 +00:00
Treehugger Robot
fc99d35ccf Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b
 2020-07-27 13:43:16 +00:00