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
Treehugger Robot
268f3268b1 Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0 am: fc99d35ccf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I01bf98c6c5c0f816fbe5a6e90831b11b1f9fcd2e
 2020-07-27 14:00:45 +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
Treehugger Robot
5c018260e0 Merge "Remove gendered language" am: 35616155b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: Id351aef2dc3869ab5fa0b4c909f367b64eead9b2
 2020-07-27 13:29:07 +00:00
Treehugger Robot
35616155b5 Merge "Remove gendered language" 2020-07-27 13:15:52 +00:00
Treehugger Robot
240de71ebd Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2 am: 9df4a45b87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: I5a210748f9e6e06789b8758fd0c3861e77a41bc7
 2020-07-27 06:03:39 +00:00
Treehugger Robot
9df4a45b87 Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: Ic3ef5f4df089968c4105fec48c9c494c57f1f608
 2020-07-27 05:49:03 +00:00
Zhiyin Luo (罗植尹)
fc869035b6 fix uninitialization issue in JankTracker 
We should initialize mSwapDeadline in JankTracker, or it can be a very
large randomized value and then makes jank tracker not collect concrete
jank type of frames appropriately as expected.

Bug: 161656795
Test: run cts -m CtsIncidentHostTestCases -t
   com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame
Change-Id: I057a50a74502918619204f9164f6a954f8e9c5de
Merged-In: I057a50a74502918619204f9164f6a954f8e9c5de
(cherry picked from commit 7a0d224756)
 2020-07-27 05:46:14 +00:00
Treehugger Robot
5383e257e2 Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: Iccc3389dfc0ee64f819dd9c2d9bf7ca78f0a1490
 2020-07-27 05:37:31 +00:00
Treehugger Robot
f366f37aa1 Merge "Update language to comply with Android’s inclusive language guidance" 2020-07-27 05:21:10 +00:00
Yo Chiang
d5a6030fd2 Update language to comply with Android’s inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for
reference

#inclusivefixit

Bug: 161896447
Test: TH presubmit
Test: atest DynamicSystemInstallationServiceTests
Change-Id: I94ab7cabc4f86ecb266c1d7d89357da1e3f88921
 2020-07-27 04:26:09 +00:00
android-build-team Robot
87a6fd7acd Merge cherrypicks of [12236535, 12236686, 12236706, 12236707, 12236708, 12236709, 12236710, 12236711, 12236687, 12236608, 12236629, 12236688, 12236459, 12236460, 12236536, 12236412] into rvc-release 
Change-Id: I27766eaf2a654e4676823df532a0c930dd385d6b
 2020-07-26 20:57:04 +00:00
Zim
d58101e2b2 Reduce demo user FUSE volume mount timeout 
A long timeout seems to break demo users when calling
DevicePolicyManagerService#enableSystemApp.

We soft-revert Ia8f6f121448f6b5e484fd3e8cca845fdd89afc23 just for demo
users while investigating the root cause.

Test: Manual
Bug: 161702661
Change-Id: I8ff153f2649e3a1d05f2e3e6e382bbba8c79630c
(cherry picked from commit 1d6554f0e1)
 2020-07-26 20:56:04 +00:00
Lais Andrade
dc21a3c479 Propagate AudioAttributes flags to VibrationAttributes 
Set supported flags from AudioAttributes into VibrationAttributes on the
builder constructor.

Fix: b/161761418
Test: manual
Change-Id: I4a8e1db278843b2f9f19aba43b0b8f264cb696bd
(cherry picked from commit c2777148df)
 2020-07-26 20:55:59 +00:00
Jack Yu
35c84e1293 Allow network stack UID caller to retrieve cell identity 
For backwards compatibility, we allow phone, system UID to
access cell identity through getServiceState. Cell broadcast
service, which is used to be part of telephony, now is running
under network stack UID. We should consider network stack UID as
trustable components like system/telephony.

Fix: 157618105
Test: Manual
Change-Id: I9b2dfc778752e130f5c7e44c4b2e45b63ac6f918
(cherry picked from commit 56cfdd1e87)
 2020-07-26 20:55:54 +00:00
Steve Elliott
a1efa34f0b Ignore GONE views in shade when processing sections 
Fixes: 161606040
Test: atest
Change-Id: I8ab108aea23ea6a139f758abdaf222f5f3641104
(cherry picked from commit dfd9f17703)
 2020-07-26 20:55:49 +00:00
Patrick Baumann
1adf9e6560 Fix unintended preferred activity reset 
When the preferred handler of an action is saved with "always", the set
of components displayed as options to the user are saved with it. On
subsequent queries, if that set of components change, the preference is
cleared to allow the user to consider the new set. With the introduction
of app visibility filtering in R (and to a lesser extent, Instant Apps
in O), the set of apps that an app can see may be less than the set that
the system can. As a result, if the caller calls resolveIntent and
cannot see all of the apps the system can, it may reset the user
preference unexpectedly.

This change ensures that before we clear the user preference that we're
comparing against the full set of apps. As such, if we encounter a call
to the method from an app that cannot see all apps, we avoid any
mutations and instead just return the set of apps that the user can see
or the preferred app if it's part of the set they can see. If the system
calls or if the call is part of an activity start, we'll allow reset of
the preference.

Test: Manual - Install 3 cameras, verify preference only reset on start
Fixes: 157548344
Change-Id: Icb50a66500edba26c4c6c3e80a6a9c544d4d63d6
(cherry picked from commit 312755820a)
 2020-07-26 20:55:43 +00:00
Christopher Tate
fd90ff85eb Skip bg PSS collection for apps using a camera 
Bug: 144138979
Test: grant camera appOp and observe logging
Test: use camera app and observe logging
Change-Id: I6422b432f0d6fcf411073c0528a4ee485d46f005
(cherry picked from commit 5a7e662751)
(cherry picked from commit fc76b97d1b)
 2020-07-26 20:55:38 +00:00
Automerger Merge Worker
3ef9881f32 Merge "Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 95846eed9d" into rvc-d1-dev-plus-aosp 2020-07-25 16:07:29 +00:00
Zimuzo Ezeozue
c6d3cdc760 Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 95846eed9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: Ic5f8bf0637ef0bd5227326c6210a1e244e9487e4
 2020-07-25 16:07:23 +00:00
Zimuzo Ezeozue
c94d92c03a Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 53c4fc325e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: I40c808ea467d68fdd4e2970bc3d5be8e8ac15427
 2020-07-25 16:07:12 +00:00
Zimuzo Ezeozue
95846eed9d Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: If9a70b62d964ea355f69a9e5d0aa73cac55d0ca3
 2020-07-25 15:53:41 +00:00
Zimuzo Ezeozue
53c4fc325e Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: I4f02725faeee1e2ac0cd7c9cc1f76cccda6444a4
 2020-07-25 15:53:29 +00:00
Zimuzo Ezeozue
0df699ae72 Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev 2020-07-25 15:31:00 +00:00
Treehugger Robot
9a1b33f61f Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 am: ab368be7ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I68d4ba8f821a24219b02a026bffcb5676010ce84
 2020-07-25 01:46:25 +00:00
Treehugger Robot
ab368be7ad Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I2cc60fb80d146a2121d0c5cba79e83581f281816
 2020-07-25 01:28:24 +00:00
Treehugger Robot
aa0cee06b1 Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I0a278fa284a3654c4cb85fb864be1c9df72677b3
 2020-07-25 01:18:34 +00:00
Treehugger Robot
85a6580f09 Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" 2020-07-25 01:08:00 +00:00
Nate Jiang
fefb3398b6 Merge "Make broadcast protected" into rvc-d1-dev am: 1263a94728 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12228948

Change-Id: I9a47676ee09afefb6a330efc5504edd99b4d63e6
 2020-07-25 01:03:26 +00:00
Nate Jiang
1263a94728 Merge "Make broadcast protected" into rvc-d1-dev 2020-07-25 00:52:08 +00:00
Automerger Merge Worker
0830cb4d85 Merge "Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: be22e7af3f" into rvc-d1-dev-plus-aosp 2020-07-25 00:28:14 +00:00
TreeHugger Robot
fbcde7cdc1 Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: be22e7af3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: Iccf5e3cf7ee7fd845f1ce0fe9ffea4a1598500b8
 2020-07-25 00:28:04 +00:00
TreeHugger Robot
38570d081d Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: 61e32caa0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: I4018198636aa327dee326842e3e0c25478583d7b
 2020-07-25 00:27:55 +00:00
TreeHugger Robot
be22e7af3f Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: If44bc27e2001a98deb7346783645c97554111708
 2020-07-25 00:10:41 +00:00
TreeHugger Robot
61e32caa0b Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: I3b5157ab8e234e349465ed94f15f6d9ef53cac5f
 2020-07-25 00:10:39 +00:00
TreeHugger Robot
863c82fa76 Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev 2020-07-24 23:55:38 +00:00
Steven Moreland
3c95ad9cda [automerger skipped] Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 am: d40462e66d -s ours am: bd491fffc7 -s ours 
am skip reason: Change-Id I1ab977248b1c39a7d08e0ca34389a7ba168c05b0 with SHA-1 95dd53bb5f is in history

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

Change-Id: Iecc0621243ba7bef779923f3fe4f46f8fc366342
 2020-07-24 23:39:11 +00:00
Steven Moreland
bd491fffc7 [automerger skipped] Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 am: d40462e66d -s ours 
am skip reason: Change-Id I1ab977248b1c39a7d08e0ca34389a7ba168c05b0 with SHA-1 95dd53bb5f is in history

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

Change-Id: Ie3fbdd102d49b439e001c75c298876c8ae7ade8f
 2020-07-24 23:27:01 +00:00
Steven Moreland
d40462e66d Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371822

Change-Id: I306603dfaacaa1647276bfd4a072a9cfdafb2d3e
 2020-07-24 23:08:32 +00:00
Steven Moreland
298d06f292 Merge "Allow module libs to use VINTF AIDL." 2020-07-24 22:54:24 +00:00
Nate Jiang
290ee34d3b Make broadcast protected 
Bug: 161932419
Test: atest android.net.wifi
Change-Id: I0cd36cb60129ad67b90f72bd1927f53d65046c4f
 2020-07-24 22:49:28 +00:00
TreeHugger Robot
b378163ae7 Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 73a4ff6dd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12226436

Change-Id: I75de7430c8bd23d4f3382fa884169a46a68bc459
 2020-07-24 22:25:59 +00:00
Automerger Merge Worker
5b7e7ba7fd Merge "Merge "Ignore GONE views in shade when processing sections" into rvc-dev am: af2f54f4e3 am: 0b43b7be47" into rvc-d1-dev-plus-aosp 2020-07-24 22:25:55 +00:00
TreeHugger Robot
c2d1a2923e Merge "Ignore GONE views in shade when processing sections" into rvc-dev am: af2f54f4e3 am: 0b43b7be47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12211269

Change-Id: I12103a50ec0779322c7f07167e2775695173ad63
 2020-07-24 22:25:49 +00:00
TreeHugger Robot
5c8a0bbc4e Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 4f7fa277ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12226436

Change-Id: I681c8ea85626773c3d5cb74807d846a951b743ae
 2020-07-24 22:25:38 +00:00
TreeHugger Robot
ad662c89be Merge "Ignore GONE views in shade when processing sections" into rvc-dev am: af2f54f4e3 am: 474a48a9cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12211269

Change-Id: I0b13c39ab14f17bd6fe44edc62f305d03ce5c3df
 2020-07-24 22:25:17 +00:00
TreeHugger Robot
4f7fa277ab Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12226436

Change-Id: I6f82a1ee38717d801c828d4922b89dea5267215f
 2020-07-24 22:08:26 +00:00
TreeHugger Robot
73a4ff6dd6 Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12226436

Change-Id: I5b80cc571555d272c33c0f7560709032efa6532c
 2020-07-24 22:08:21 +00:00
TreeHugger Robot
474a48a9cf Merge "Ignore GONE views in shade when processing sections" into rvc-dev am: af2f54f4e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12211269

Change-Id: Id48be644b20513c19d2978b25d81f61521f2da15
 2020-07-24 22:08:01 +00:00
TreeHugger Robot
0b43b7be47 Merge "Ignore GONE views in shade when processing sections" into rvc-dev am: af2f54f4e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12211269

Change-Id: I4010f19c21bb6185e18dade509c611d03655a36f
 2020-07-24 22:07:55 +00:00
TreeHugger Robot
855eb749ed Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev 2020-07-24 21:42:45 +00:00