Commit Graph

566194 Commits

Author SHA1 Message Date
Rajeev Kumar
0458084833 Merge "Add basic dumping to AppHibernationService" am: 8596c6e90e am: a395f61ed5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597057

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia48135ef98c1c849ba7a4473e557b1ad49b82c6f
2021-02-28 17:48:25 +00:00
Rajeev Kumar
a395f61ed5 Merge "Add basic dumping to AppHibernationService" am: 8596c6e90e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597057

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I603e07b689562215c80fee47d68f9220f7da7396
2021-02-28 17:03:07 +00:00
Rajeev Kumar
8596c6e90e Merge "Add basic dumping to AppHibernationService" 2021-02-28 16:04:10 +00:00
TreeHugger Robot
e4ca4bbc93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 05f68c26dd -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecf56c7b5ac5ec6edbfa2eed12a4c103ab944b53
2021-02-27 18:58:34 +00:00
TreeHugger Robot
05f68c26dd Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-27 17:53:47 +00:00
Bill Yi
a54a7bdaf6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie71cf9a1dcad53542775ce804fad1f879caa6d72
2021-02-27 07:21:26 +00:00
Julien Desprez
3043de8cdd Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a am: 8ae5fd7f1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49f25cdd28d45d453a96b416011d6fd4c65f54a5
2021-02-27 01:34:53 +00:00
Connor O'Brien
fad30e4c7b Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7275e44e3f4cd090cf5c03e25a8b83a8acbbf26
2021-02-27 01:05:46 +00:00
Christian Wailes
7f037415ea Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf am: 4eb5f086d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75f5867f97f923e07286b798a7abffef502ebf8e
2021-02-27 01:05:01 +00:00
Julien Desprez
8ae5fd7f1c Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ab6d11a665cc671eb22dda389ed44aa0366e343
2021-02-27 01:01:29 +00:00
Julien Desprez
f9e2a9c55a Merge "attempt to run protologtool-tests as unit tests" 2021-02-27 00:41:48 +00:00
Connor O'Brien
9267c31a1c Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e00f5aa8eec8fb3246a375f002820338d4572f
2021-02-27 00:27:16 +00:00
Christian Wailes
4eb5f086d4 Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06a3a499afba0b7a20b8b474393aa68cffb4fd23
2021-02-27 00:23:21 +00:00
Connor O'Brien
a0bbd188e4 Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" 2021-02-27 00:04:47 +00:00
Christian Wailes
76348ffadf Merge "Add LocalManagerRegistry inside system server." 2021-02-26 23:26:38 +00:00
Shuo Qian
ee60579798 Merge "Add Emergency callback mode shell command" into rvc-qpr-dev-plus-aosp 2021-02-26 22:56:18 +00:00
Brad Ebinger
d2fbe50daa Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332 am: f92683b7d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2c57f359f140a22e6d1bc84cc9b05ae47ba52ae
2021-02-26 21:17:19 +00:00
Evgenii Stepanov
0ab80262df Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a am: ac811c4025
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4987b360e6ca7d6f60b50c233f60db555c98d1d1
2021-02-26 21:16:44 +00:00
Alex Stetson
dfb10a81c4 [automerger skipped] Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev am: f8501da319 -s ours
am skip reason: Change-Id I62b8778517730076554ba996cee80862ce72539b with SHA-1 f87daf40c2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b53f010f0ec2e87b2180789f0de387f0e5e0a72
2021-02-26 21:14:57 +00:00
Brad Ebinger
f92683b7d1 Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62579792679ebb079d9fd2f97720a66d1d5aec3f
2021-02-26 20:54:10 +00:00
Evgenii Stepanov
ac811c4025 Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c84f162736af927f6cac041f4200dc3ab2b8efa
2021-02-26 20:50:30 +00:00
Brad Ebinger
44d6bdc332 Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" 2021-02-26 20:45:18 +00:00
Alex Stetson
f8501da319 Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev 2021-02-26 20:37:24 +00:00
Joseph Pirozzo
e4dc456d4b Configure Bluetooth profiles displayed in settings
Two profiles were displayed on automotive targets at the wrong times,
MAP was displayed for all devices, PBAP was displayed only when
enabled.  This updates those two profiles to appear in the profiles only
when the service is enabled locally and the remote device supports the
other half of the connection.

Bug: 173818456
Bug: 109783106
Test: pair with bluetooth devices that support (and don't support) MAP
and PBAP, and verify settings slider appears when appropriate
specifically when disabled.

Change-Id: I62b8778517730076554ba996cee80862ce72539b
Merged-In: I62b8778517730076554ba996cee80862ce72539b
2021-02-26 20:36:38 +00:00
Evgenii Stepanov
d600f5067a Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." 2021-02-26 20:11:10 +00:00
Suren Baghdasaryan
44c20b347f Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae am: 355bd7d9b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If10eb20b7dfbe070536afded8ad0e25747a3ed5a
2021-02-26 19:13:56 +00:00
Treehugger Robot
763ecd2ae7 Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91 am: b05555721c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606551

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2b8add333b85b30a68ca2287ba76c4316044176
2021-02-26 19:12:26 +00:00
Hunter Knepshield
0f5e18a9f0 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71f11a4a2ecec595a428f611d5bf62181a5e18d4
2021-02-26 19:12:00 +00:00
Winson Chiu
472f02851f Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe am: b87d41ab87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4dce6d50b8df36cb368519cbf1fad7c7054c7a6
2021-02-26 19:11:28 +00:00
Suren Baghdasaryan
355bd7d9b8 Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b6ebf686a92e6f2dd00691e5d2d4900dd871c99
2021-02-26 19:02:10 +00:00
Treehugger Robot
b05555721c Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606551

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I489457c48373a037712c67363d5a1dd8597c0bf6
2021-02-26 18:59:15 +00:00
Suren Baghdasaryan
d061730dae Merge "Fix total memtrack Graphics and GL calculations" 2021-02-26 18:59:10 +00:00
Suren Baghdasaryan
1ec9894cd6 Fix total memtrack Graphics and GL calculations
Some execution paths do not account memtrack reported Graphics and GL
values in the calculations of memtrack total memory consumption.
Fix this by adding the missing parts.

Bug: 174546244
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I77f06322fbb06ffa33115c1469aba80e59247904
Merged-In: I77f06322fbb06ffa33115c1469aba80e59247904
2021-02-26 18:59:01 +00:00
Hunter Knepshield
b79c80ba78 Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0c2b746e1be4944a6caa05c6764f37cf960bace
2021-02-26 18:52:56 +00:00
Treehugger Robot
5cc4c3ff91 Merge "Rename the font file with PostScript name based file name" 2021-02-26 18:38:22 +00:00
Winson Chiu
b87d41ab87 Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cc5663bb712bcf4f8a2fd8c6a335bc5a4a50946
2021-02-26 18:36:42 +00:00
Hunter Knepshield
39742a519c Merge "[API review] Additional detail in BugreportCallback javadoc." 2021-02-26 18:31:22 +00:00
Winson Chiu
1736ad8bfe Merge "Add OWNERS for pm.verify.domain" 2021-02-26 17:49:47 +00:00
Andrei-Valentin Onea
75c6b35d4b Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff am: 0f53ddc205
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9086ea63f1a062819e686d510b013dfb446fb3e7
2021-02-26 17:33:30 +00:00
Andrei-Valentin Onea
0f53ddc205 Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3b58c1aa33e9ff8692370e701d258b391eb563e
2021-02-26 16:58:48 +00:00
Andrei-Valentin Onea
eaf3fd59ff Merge "Fix deadlock on CompatConfig.mChanges" 2021-02-26 16:26:21 +00:00
Vladimir Marko
87cb8b5efe Merge "Change dirty-image-objects file format." am: 523e3b9b79 am: e70dab7633
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05badb220f2c830ab5ef59ba2146ea74852c227b
2021-02-26 12:44:24 +00:00
Junyu Lai
b23e201f01 Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66 am: 32e8e9eb24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a88984dbd2c8171837bd1cf2e58ed07c1d6c0d7
2021-02-26 12:43:58 +00:00
Vladimir Marko
e70dab7633 Merge "Change dirty-image-objects file format." am: 523e3b9b79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5641323dfc73d02993a3904596330743df209d34
2021-02-26 11:33:57 +00:00
Junyu Lai
32e8e9eb24 Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6f0e981228ef886496f55626b499f9c487af320
2021-02-26 11:30:53 +00:00
Vladimir Marko
523e3b9b79 Merge "Change dirty-image-objects file format." 2021-02-26 11:08:46 +00:00
Junyu Lai
702ca13a66 Merge "[FUI08] Create NeworkStateSnapshot" 2021-02-26 10:53:36 +00:00
James Lin
ee8b27d293 Merge "Update the UCE OPTIONS API" am: a2d03f9eec am: 2f9c50d50a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d6c55e59a39875e4cc8213c0dd950113d522414
2021-02-26 10:07:03 +00:00
Zoey Chen
4d942da6f9 Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia03b7e2c3c1e7aec5835d46932790d0708cdcc81
2021-02-26 10:06:39 +00:00
Almaz Mingaleev
08f03dc59c Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25dc972b3303e1950eb8a7192852876e2e1fad5b
2021-02-26 10:05:16 +00:00