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

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Mayer
6fc6a67ec3 Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: e0d071525b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: If18870b493379666879316947b2f1664c1a4845f
 2020-08-13 22:05:36 +00:00
Steven Moreland
bf9f6b4f3b Merge "ApplicationLoaders: improve classloader cache errs" am: 6bfe7f9a26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399628

Change-Id: Id846805fb7af354f3aabf7ad222f8f8bd87f0d53
 2020-08-13 22:04:30 +00:00
Florian Mayer
ddb152733c Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 am: ba354cf97c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I1b32adc87fbf770997fd6e10d44f8dce11b3e512
 2020-08-13 22:03:42 +00:00
Florian Mayer
e0d071525b Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I7ee33c05511b22c1a3f22fb5864b7d1ffd38098e
 2020-08-13 21:43:47 +00:00
Florian Mayer
ba354cf97c Merge "Do not leak dump objects." into rvc-dev am: 406dd94dd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316627

Change-Id: I58105c1a21eb5c6468e0c08a1237fbf0c84633f9
 2020-08-13 21:43:37 +00:00
Steven Moreland
6bfe7f9a26 Merge "ApplicationLoaders: improve classloader cache errs" 2020-08-13 21:26:19 +00:00
Florian Mayer
406dd94dd5 Merge "Do not leak dump objects." into rvc-dev 2020-08-13 21:02:33 +00:00
Sudheer Shanka
ee63631f2f [automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours am: a47e1f9a24 -s ours 
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history

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

Change-Id: Ie4182d1002133522f7f08bfe1da1b33070bbcd0c
 2020-08-13 20:33:45 +00:00
Sudheer Shanka
a47e1f9a24 [automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours 
am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history

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

Change-Id: I47ccfab7dd61ebd29360ed5bf012942f2547c0d0
 2020-08-13 20:17:25 +00:00
Sudheer Shanka
7f45a6fcc0 Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1394342

Change-Id: I234af0318651866983f9089e50e1edcd3e99b547
 2020-08-13 20:00:49 +00:00
Sudheer Shanka
bdfb45d841 Merge "Update language to comply with Android’s inclusive language guidance." 2020-08-13 19:46:49 +00:00
Grace Jia
300b3cce72 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de am: 6a55cd1644 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: Ifc88640d6fb38e14a58ad802f520b0c0ee0b35b8
 2020-08-13 19:06:43 +00:00
Grace Jia
6a55cd1644 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 am: e40cfa60de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I49034d851b111792fa54b3d2f236d56513bb00f9
 2020-08-13 18:46:06 +00:00
Brad Ebinger
d3a397fe80 Remove IMS call logs that may leak PII 
Bug: 160389340
Test: Check logs for PII
Change-Id: I203b37d8e643c59d69aa26097d223fc4b3f8e332
 2020-08-13 18:34:56 +00:00
Grace Jia
e40cfa60de Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." am: 329c6ff777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388908

Change-Id: I051c16bcaca7f30db5c62772a3d3f39c23f18304
 2020-08-13 18:21:29 +00:00
Grace Jia
329c6ff777 Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService." 2020-08-13 18:06:19 +00:00
Brad Ebinger
3678f55652 Remove IMS call logs that may leak PII 
Bug: 160389340
Test: Check logs for PII
Change-Id: I203b37d8e643c59d69aa26097d223fc4b3f8e332
Merged-In: I203b37d8e643c59d69aa26097d223fc4b3f8e332
 2020-08-13 17:46:45 +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
Alison Cichowlas
86050129a0 [automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours am: 0191494230 -s ours 
am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd58 is in history

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

Change-Id: Id4adc4a5434dc140baabe46bb631939c59078d11
 2020-08-13 14:59:33 +00:00
Alison Cichowlas
0191494230 [automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours 
am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd58 is in history

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

Change-Id: Ifc81acb7fc6a1fa64db0bbbf66d5be817a7282a1
 2020-08-13 14:40:22 +00:00
Andrei-Valentin Onea
da9fd82cd3 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 am: 3c8464e035 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: I5459bb5b6cc8741b1128822fa9d5d1a11515df5f
 2020-08-13 14:35:20 +00:00
Alison Cichowlas
6ff4300aa1 Merge "Show the nearby chip for images and files too." am: bd8e5ae31c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397108

Change-Id: I38f79f585072673d40ae8d3dab72cdd838b92c2c
 2020-08-13 14:27:28 +00:00
Andrei-Valentin Onea
3c8464e035 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d am: 33afbc9347 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: Icb900741395045bb16853cc18cf5aeafa4ef08d2
 2020-08-13 14:16:02 +00:00
Alison Cichowlas
bd8e5ae31c Merge "Show the nearby chip for images and files too." 2020-08-13 14:11:41 +00:00
Andrei-Valentin Onea
33afbc9347 Merge "Drop deprecated API lists from csv merge script" am: 269f58445d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392982

Change-Id: I495d09f69d23fe935c2b4141f15b164ff0c862ce
 2020-08-13 13:58:45 +00:00
Andrei-Valentin Onea
269f58445d Merge "Drop deprecated API lists from csv merge script" 2020-08-13 13:42:13 +00:00
Sudheer Shanka
e64b3e7ba8 Merge "Update language to comply with Android’s inclusive language guidance." into rvc-dev-plus-aosp am: 7f61eb2622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347904

Change-Id: I5b9a25710e5088c525fde0416b770d25017c70b2
 2020-08-13 07:14:54 +00:00
Sudheer Shanka
7f61eb2622 Merge "Update language to comply with Android’s inclusive language guidance." into rvc-dev-plus-aosp 2020-08-13 07:01:06 +00:00
Sudheer Shanka
759c96a3d4 Update language to comply with Android’s inclusive language guidance. 
See https://source.android.com/setup/contribute/respectful-code for reference

Leaving the power save whitelists as is for now. These will be handled
in a follow-up cl.

Bug: 161896447
Test: atest ./hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest ./services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: I5059d8362a02a7b4622c71fdf15297af87c5a3dd
Merged-In: I5059d8362a02a7b4622c71fdf15297af87c5a3dd
Exempt-From-Owner-Approval: clean cherrypick
(cherry picked from commit 76e523aa00)
 2020-08-13 06:59:40 +00:00
Chalard Jean
a0794291ec Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: 9da93f616e am: 70572e1b82 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
 2020-08-13 04:43:45 +00:00
Chalard Jean
70572e1b82 Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: 9da93f616e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
 2020-08-13 04:26:11 +00:00
Chalard Jean
9da93f616e Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
 2020-08-13 04:09:27 +00:00
Treehugger Robot
e3538bc744 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46 am: 0e9d68e890 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I7c162efccbeda3d669a784cc9bbaffbc339a123d
 2020-08-13 04:01:20 +00:00
Chalard Jean
b1a3247ab4 Merge "Rename Kotlin util files to not include the Kt suffix" 2020-08-13 03:52:47 +00:00
Treehugger Robot
0e9d68e890 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb am: 2918f0ef46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: I3ef3df5cb8c99c97770ced51a7c8e0dff5f629a7
 2020-08-13 03:44:13 +00:00
Treehugger Robot
2918f0ef46 Merge "Remove bluetooth address from logs in SettingsLib" am: 4ad4ca07bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397949

Change-Id: Ic14a585b51e106c7d363fcd1231e5cd884c5727b
 2020-08-13 03:29:24 +00:00
Treehugger Robot
4ad4ca07bb Merge "Remove bluetooth address from logs in SettingsLib" 2020-08-13 03:13:22 +00:00
Etan Cohen
57855efc38 Fix WiFi + "x" stil visible 
The WiFi + "x" still seems to appear under some conditions - code
path checking on changes in status not triggered correctly.

Also remove one of the calls to the WifiManager#getCurrentNetwork.
Partial fix to WifiManager#getCurrentNetwork blocking.

Bug: 161011371
Bug: 163425287
Test: atest NetworkControllerWifiTest
Test: visual inspection
Change-Id: I112bdff85e905807c4e2826c127aeaedcdb03fd1
 2020-08-13 01:41:22 +00:00
Hans Boehm
6b9c4df784 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22 am: 7949fea1f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I819029d39b513cd6b2bef7158ae3e5dc0967be80
 2020-08-13 01:17:07 +00:00
Hans Boehm
7949fea1f9 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 am: 2996c1be22 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I497efcccc6d456789a9b095942681625e93334ff
 2020-08-13 00:51:24 +00:00
Hans Boehm
2996c1be22 Merge "API and boot image updates to import RI BigInteger" am: 47ce951f33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331800

Change-Id: I67884decf7971ba52fbab365ef83e9f5610fc2d1
 2020-08-13 00:35:03 +00:00
Hans Boehm
47ce951f33 Merge "API and boot image updates to import RI BigInteger" 2020-08-13 00:15:01 +00:00
android-build-team Robot
28cdba4657 Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743, 12364605, 12363956, 12363957, 12363958, 12364309, 12364483, 12364484, 12364564, 12364333, 12364334, 12364335, 12364336, 12364337, 12364607] into rvc-release 
Change-Id: Ida8066f2651eb78529f4de6b18a82f3cf672975c
 2020-08-12 21:45:28 +00:00
Steve Elliott
a95061ca2d Mark implicit PendingIntents as immutable 
Bug: 156020795
Test: manual, atest
Change-Id: I72206c7a52b067b77d6542d170a6483713dfeee7
(cherry picked from commit 84e08280d3)
(cherry picked from commit 02bdeeffb3)
 2020-08-12 21:44:14 +00:00
John Reck
cbcf477e8b Add missing isShellUser check 
Bug: 160390416
Test: verified command still works from shell
Change-Id: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
Merged-In: I23bb06e00f1623e4f27c02d7eb2c0d273b40771b
(cherry picked from commit bfdb7121ef)
 2020-08-12 21:44:05 +00:00
Tyler Gunn
4a68a87715 [automerger skipped] Merge "Improve remote connection logging." am: 560c97bc25 am: 6fc6f4f615 -s ours am: d7f7f43f03 -s ours 
am skip reason: Change-Id I916750e0f558db1eb9e581bab7a9fbc71f781709 with SHA-1 972a6ef338 is in history

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

Change-Id: I321ef9a82c9303d0693a625716d8088b1319960a
 2020-08-12 19:31:13 +00:00
Tyler Gunn
1c0e198f55 [automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours am: 52bf8ea08e -s ours 
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history

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

Change-Id: Ic765bc2cad10a20404c428ca58d3e7ec6512a7dd
 2020-08-12 19:30:41 +00:00
Tyler Gunn
d7f7f43f03 [automerger skipped] Merge "Improve remote connection logging." am: 560c97bc25 am: 6fc6f4f615 -s ours 
am skip reason: Change-Id I916750e0f558db1eb9e581bab7a9fbc71f781709 with SHA-1 972a6ef338 is in history

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

Change-Id: Ifb5c146a1f3a0939529ba910e3d9880186d4d9b1
 2020-08-12 19:12:56 +00:00
Tyler Gunn
52bf8ea08e [automerger skipped] Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa22e am: e3051550fd -s ours 
am skip reason: Change-Id I1665d456dace8e41cc035e792f319d98dd07219c with SHA-1 28ba067389 is in history

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

Change-Id: I126739bf23b48f485e5f033583e18ae5bca0fba6
 2020-08-12 19:12:44 +00:00
Tyler Gunn
6fc6f4f615 Merge "Improve remote connection logging." am: 560c97bc25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392011

Change-Id: I06e1b087ff16046065bd651ddc14c4c3774051ba
 2020-08-12 18:56:42 +00:00