Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
657,699 Commits 3 Branches 0 Tags
c0cdcbfefb08eeea2d2b689888f72043e95508bb
Commit Graph

657699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
836927f24b Merge "Add support for app data accounting for in-kernel dataplanes" into sc-dev 2021-07-03 02:01:54 +00:00
Michael Wachenschwanz
88d0effbac Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev am: 42f68a76f5 am: bbe27fc68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189209

Change-Id: I6618f3ada0cacf0e0c5294146a3ebeb1f24cd391
 2021-07-03 01:52:19 +00:00
Kohsuke Yatoh
c918cb5f26 Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev am: 0bff2fa4b2 am: c6e9fd1ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114229

Change-Id: Id289d191725d5810047cc3c34abf9bdb1de76427
 2021-07-03 01:51:34 +00:00
Michael Wachenschwanz
eb0a2a05da Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev am: 42f68a76f5 am: f4e926e669 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189209

Change-Id: I7bc7156ff74fd1fa7946d2b65a23ec029038e544
 2021-07-03 01:51:18 +00:00
Kohsuke Yatoh
bbf876733b Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev am: 0bff2fa4b2 am: 17cd93a447 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114229

Change-Id: I626f6aa6ba061d8eae3b5276a3695b39e01088bc
 2021-07-03 01:50:54 +00:00
Michael Wachenschwanz
f4e926e669 Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev am: 42f68a76f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189209

Change-Id: I526ee6ea4a8633765d64ae8d59eaa77087ad7b3c
 2021-07-03 01:46:29 +00:00
Michael Wachenschwanz
bbe27fc68c Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev am: 42f68a76f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189209

Change-Id: Ied79c86fd459e936779a44a2c81fafc18e761d42
 2021-07-03 01:46:03 +00:00
Kohsuke Yatoh
17cd93a447 Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev am: 0bff2fa4b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114229

Change-Id: I9cbf52de6a9863e0984a0529fca90c4857497ca5
 2021-07-03 01:45:39 +00:00
Kohsuke Yatoh
c6e9fd1ef0 Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev am: 0bff2fa4b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114229

Change-Id: Id5c855a1406a0738b6aaf81e7af1336bc5f25a5c
 2021-07-03 01:44:44 +00:00
Michael Wachenschwanz
42f68a76f5 Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev 2021-07-03 01:41:41 +00:00
Kohsuke Yatoh
0bff2fa4b2 Merge "Remove dependency to real NotoColorEmoji.ttf." into sc-dev 2021-07-03 01:29:45 +00:00
Ady Abraham
87d09f88d5 RefreshRatePolicy: a few fixes 
RefreshRatePolicyTest had some tests that checks for an app override
vote but use the same vote as the deny list or camera that they are
trying to override. This CL fixes all tests and the implementation
to return the expected values.

Test: atest RefreshRatePolicyTest FrameRateSelectionPriorityTests
Bug: 192413241
Change-Id: I0f37f856947ea39de6ea11c77c11771cbca29b49
 2021-07-02 17:50:38 -07:00
Dmitri Plotnikov
d730ccd899 Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4 am: ee0373e491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: I0f0797fc859c3f8122226dc4190a98282f9bcc01
 2021-07-03 00:37:46 +00:00
Lucas Dupin
7c09d71df4 Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9 am: cf3afda6a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192416

Change-Id: Ia2245fb36095fdd36193416c47514fbee656e846
 2021-07-03 00:37:28 +00:00
Dmitri Plotnikov
ee0373e491 Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: I20670af72e0fe93f4d86c08c72e722ec4595bd67
 2021-07-03 00:27:32 +00:00
Lucas Dupin
cf3afda6a3 Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192416

Change-Id: Iefbb4c479ab2976fce75002ccd9c5d9bddd41ec2
 2021-07-03 00:27:07 +00:00
Dmitri Plotnikov
b40a34e68e Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4 am: f99c289be5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: Ic176c205eb9403ce5c880474ff6132abe5780091
 2021-07-03 00:19:53 +00:00
Automerger Merge Worker
753921ce5d Merge "Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9 am: 9471396cdb" into sc-v2-dev-plus-aosp 2021-07-03 00:19:44 +00:00
Lucas Dupin
db7d09dc72 Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9 am: 9471396cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192416

Change-Id: Ic36283069d16d13dac1be5306ab0933bd28baaff
 2021-07-03 00:19:38 +00:00
Nate Myren
3be023a11d Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev am: 243bce6262 am: a46304f591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15185845

Change-Id: Ic9a20e9e78505cc81c924decfeaa165759fc0f41
 2021-07-03 00:19:33 +00:00
Dmitri Plotnikov
f99c289be5 Merge "Address race condition in procstate time tracking" into sc-dev am: b1f548e3e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15177890

Change-Id: I322ee8c8ab5b64607c2815ae28122b9667fbc67c
 2021-07-03 00:18:57 +00:00
Nate Myren
b81695c89b Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev am: 243bce6262 am: bb7102e273 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15185845

Change-Id: Ib31cb69d779f916856fc79bb06861b8496cf71f2
 2021-07-03 00:18:53 +00:00
Dmitri Plotnikov
b1f548e3e4 Merge "Address race condition in procstate time tracking" into sc-dev 2021-07-03 00:14:15 +00:00
Lucas Dupin
9471396cdb Merge "Remove zoom from wake-up transition" into sc-dev am: e7041811c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15192416

Change-Id: I8fad1b0fdc4d31819fee12b5ff1cc1c05c98f736
 2021-07-03 00:13:15 +00:00
Lucas Dupin
e7041811c9 Merge "Remove zoom from wake-up transition" into sc-dev 2021-07-03 00:10:56 +00:00
Nate Myren
bb7102e273 Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev am: 243bce6262 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15185845

Change-Id: I4867305e4194b1b40ea8a9b6e07e1da47c1d5cf5
 2021-07-03 00:08:03 +00:00
Nate Myren
a46304f591 Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev am: 243bce6262 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15185845

Change-Id: I35bf4d3c4824e890a1d446ce46d0e55a96b46e30
 2021-07-03 00:07:08 +00:00
Nate Myren
243bce6262 Merge "Avoid creating Recognition Callback if preflight fails" into sc-dev 2021-07-02 23:50:37 +00:00
Bill Yi
ae4af59b3a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib576eb8b00a1d8c1768231e90eff72e6be8be546
 2021-07-02 23:40:57 +00:00
Bill Yi
34538a99b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I00c92bad34a6f6dbfe8118af2c6b5045c333eebd
 2021-07-02 23:36:44 +00:00
Bill Yi
5f9bb36d6d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fe65c1d20bc9fe81c3be015b3ccb7cdb7d93079
 2021-07-02 23:29:46 +00:00
Ryan Mitchell
8af1b8b700 Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e am: c207ba65a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: Ifb15a29e66ef18a18eeab657a7d24f86545013c7
 2021-07-02 23:26:07 +00:00
Peiyong Lin
a851231f28 Merge "Return success when the command is executed." into sc-dev am: 79a5f7ab9d am: 4e81740f1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179875

Change-Id: I1215ee4b4833afa709d9fcd42da1e2c1df399b9a
 2021-07-02 23:25:29 +00:00
TreeHugger Robot
1e113449a1 [automerger skipped] Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf am: 77486b7302 -s ours 
am skip reason: Merged-In I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f with SHA-1 d748e6ec7a is already in history

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

Change-Id: Iccaf1eb17c39af0bb3968386c80bf44c6f0dc09c
 2021-07-02 23:24:34 +00:00
Ady Abraham
1e5c50bbe3 RefreshRatePolicy: getPreferredRefreshRate should consider preferredRefreshRate 
If an app set the WindowManager.LayoutParams#preferredRefreshRate, refresh
rate policy should return it the the preferred refresh rate of the window
if all the other signals (preferredDisplayModeId or deny list) doesn't
have a vote.

Test: atest RefreshRatePolicyTest FrameRateSelectionPriorityTests
Bug: 192413241
Change-Id: I55dc5c2acc8b66cfedbd0c0f0fb66c57eeaa36fe
 2021-07-02 16:23:45 -07:00
Bill Yi
1bd9fc82e1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If42deaf592f9b28d3fbcd8b7864b016d51019dcb
 2021-07-02 23:21:36 +00:00
Ryan Mitchell
fcfca9b1ca Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e am: 166d16b26e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: Iadc6c3c7a9fe292441447fc6fd8dcfc783df26f6
 2021-07-02 23:20:01 +00:00
Peiyong Lin
be630c0e03 Merge "Return success when the command is executed." into sc-dev am: 79a5f7ab9d am: e7008de8a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179875

Change-Id: I5ef9d88f3318c8709e9bac24cc29839c597c0ae2
 2021-07-02 23:19:48 +00:00
Ryan Mitchell
166d16b26e Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: Ic87c6d59feeb669562bf45e7ba2bb5a46341c5a6
 2021-07-02 23:16:32 +00:00
Peiyong Lin
e7008de8a4 Merge "Return success when the command is executed." into sc-dev am: 79a5f7ab9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179875

Change-Id: I61aaec74fd6f4e8eace8cf74b9c8a052109320b2
 2021-07-02 23:15:31 +00:00
Ryan Mitchell
c207ba65a3 Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: I8593fca10f42cf790c42f15ff2d9bc1f377ab5e0
 2021-07-02 23:12:05 +00:00
Peiyong Lin
4e81740f1b Merge "Return success when the command is executed." into sc-dev am: 79a5f7ab9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179875

Change-Id: Ic68ff0146f0a220192daddeaff64be47dd08c60d
 2021-07-02 23:11:53 +00:00
Ryan Mitchell
66d9c07d2e Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev 2021-07-02 23:11:46 +00:00
TreeHugger Robot
77486b7302 Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180070

Change-Id: If669e7cb662a88ac1eb8267f82123733fff0ab0b
 2021-07-02 23:11:35 +00:00
TreeHugger Robot
c1a18b4557 [automerger skipped] Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf -s ours am: 9e96fda4af -s ours 
am skip reason: Merged-In I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f with SHA-1 d748e6ec7a is already in history

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

Change-Id: I37b976e5be2e260a63e334caeea1c4c4f331404a
 2021-07-02 23:11:18 +00:00
Peiyong Lin
79a5f7ab9d Merge "Return success when the command is executed." into sc-dev 2021-07-02 23:11:02 +00:00
Jiabin Huang
7ea6e6a8ca Merge "Add context in AudioManager.hasHapticChannels." into sc-dev am: 1d4e2f5bb0 am: 0de6ce63c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180281

Change-Id: I811449ad67f63289df13c9fef37c7ec0e23bce3f
 2021-07-02 23:10:45 +00:00
TreeHugger Robot
9e96fda4af [automerger skipped] Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev am: dc8a8029bf -s ours 
am skip reason: Merged-In I3dbcdacff062f6c33c2fdc8d64170bf60b2fbf6f with SHA-1 d748e6ec7a is already in history

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

Change-Id: Ibc0c24e1d5e900b424188a73e17b18cf3aeeb1eb
 2021-07-02 23:09:08 +00:00
TreeHugger Robot
dc8a8029bf Merge "Update BluetoothAdapter and BluetoothDevice documentation" into sc-dev 2021-07-02 23:02:30 +00:00
Jiabin Huang
b5924376c2 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev am: 1d4e2f5bb0 am: 3832851c97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180281

Change-Id: I014b59eb5031b071cb37f2bb3b3d0a0e0ae0a652
 2021-07-02 23:00:00 +00:00