Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
566,279 Commits 3 Branches 0 Tags
3ad96cbfe18bb6df0fddeefcb0af30b0cd98ffdd
Commit Graph

566279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heemin Seog
3ad96cbfe1 Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f2dcbbb43e75cecf7d21dd9967b07087aa8a55
 2021-03-01 18:01:59 +00:00
Heemin Seog
c76299428e DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf68c025d3fab83724ed802fd99826668cf81bf3
 2021-03-01 18:01:41 +00:00
Heemin Seog
de0869335a Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev 2021-03-01 17:28:20 +00:00
TreeHugger Robot
0a66a75b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da87a730af4b63b72948c4a277db06e82439c00
 2021-03-01 17:23:38 +00:00
TreeHugger Robot
1e3abbf022 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-01 16:48:23 +00:00
Xin Li
61c81af99a [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours 
am skip reason: Change-Id Id1351d1d694e96564317e12c79a2484fd33f762e with SHA-1 a49208f178 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2912b4d3c8e608139d49ea2739878e4f4775a5ab
 2021-03-01 09:03:27 +00:00
Lorenzo Colitti
2479f01e8d Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b am: a49208f178 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibef70ffb262f8446348ae7cc1cb7fd61a089a007
 2021-03-01 09:02:33 +00:00
Xin Li
80d1724769 DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Id1351d1d694e96564317e12c79a2484fd33f762e
Change-Id: Ifa2323c69b4f72fb02aeb4330dbbe12b3ddcd172
 2021-03-01 00:43:22 -08:00
Bill Yi
be333346b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45f5d57fe0b27b6b103c6af8f6941d6a0f36005e
 2021-03-01 08:25:12 +00:00
Lorenzo Colitti
a49208f178 Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1351d1d694e96564317e12c79a2484fd33f762e
 2021-03-01 08:11:39 +00:00
Lorenzo Colitti
6a01b8d23b Merge "Delete the last remaining user of TestNetworkStackLib." 2021-03-01 07:47:47 +00:00
Lorenzo Colitti
55d9c5a693 Delete the last remaining user of TestNetworkStackLib. 
FrameworksNetIntegrationTests is the last user of this target.
It is not really necessary since it can trivially be replaced by
NetworkStackApiStableLib.

Bug: 167645754
Test: atest FrameworksNetIntegrationTests
Change-Id: Id5e8eb3f58590f4b3cfbcbef66b00acbba77a7a7
 2021-03-01 15:12:53 +09:00
Remi NGUYEN VAN
51b9ccb115 Merge "Split out the connectivity API surface" am: 3d31f1ead0 am: 587784cd4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced065c53194f4c5bd54198e05ddc455a97ba50e
 2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
587784cd4c Merge "Split out the connectivity API surface" am: 3d31f1ead0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e51465cfeab43ff5f154771e2e22a7cd981d066
 2021-03-01 02:10:04 +00:00
Remi NGUYEN VAN
3d31f1ead0 Merge "Split out the connectivity API surface" 2021-03-01 01:07:19 +00:00
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