Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,358 Commits 3 Branches 0 Tags
7f9705326723978a7d807c7e51c56c582ed2d405
Commit Graph

659358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Scott
7f97053267 Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae am: 733ee81b03 am: c0f0020671 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102

Change-Id: Ic33ad172213349dd93db8e534de88a81eedeaa4b
 2021-10-18 19:02:21 +00:00
Jakub Pawlowski
1ec83b8226 Merge "server/audio: Add LeAudio support" am: 4fef608423 am: 791c25e77b am: 4089d3ed46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856323

Change-Id: I2e0e01fe30e4bacbd73a4d13b4294f42f485bfb9
 2021-10-18 19:02:09 +00:00
Jonathan Scott
c0f0020671 Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae am: 733ee81b03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102

Change-Id: Iaa05f7bc4d0ed56c190ef8b508b0abf2e07efef1
 2021-10-18 18:50:24 +00:00
Jakub Pawlowski
4089d3ed46 Merge "server/audio: Add LeAudio support" am: 4fef608423 am: 791c25e77b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856323

Change-Id: I5b22305a2a3d0c8a39b6372e575845105307e798
 2021-10-18 18:50:16 +00:00
Treehugger Robot
8a19d66f6b Merge "[Telephony] Add more javadoc for carrier privileges" am: 210da8ceef am: 4b3059129b am: 58337991f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860618

Change-Id: I6d13a651c30c693ebbbb4c97fe3f341253c8e22b
 2021-10-18 18:44:25 +00:00
Jonathan Scott
733ee81b03 Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102

Change-Id: I4694a809e278c45f92561aa387c5abc2d9c307be
 2021-10-18 18:39:42 +00:00
Jakub Pawlowski
791c25e77b Merge "server/audio: Add LeAudio support" am: 4fef608423 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856323

Change-Id: I4dbf981c437bb5341a02e52acbf6da1b385c6ad2
 2021-10-18 18:39:28 +00:00
Jonathan Scott
7593e112ae Merge "Centralise owners for Enterprise Platform team." 2021-10-18 18:31:04 +00:00
Treehugger Robot
58337991f2 Merge "[Telephony] Add more javadoc for carrier privileges" am: 210da8ceef am: 4b3059129b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860618

Change-Id: If0e631820c1fb13a48eb74cef7be9251743c746d
 2021-10-18 18:29:40 +00:00
Jonathan Scott
7443751dd9 Centralise owners for Enterprise Platform team. 
This will allow us to point other directories at these files for OWNERS
and make it easier to update after future team changes.

Test: N/A
Bug: 202714830
Change-Id: Iaaf5b8eb7568be4ebfd1b30abae0b757153f0391
 2021-10-18 19:28:50 +01:00
Jakub Pawlowski
4fef608423 Merge "server/audio: Add LeAudio support" 2021-10-18 18:21:02 +00:00
Treehugger Robot
4b3059129b Merge "[Telephony] Add more javadoc for carrier privileges" am: 210da8ceef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860618

Change-Id: I3b92d4690cc206e96cd405779a5b74edd0a215ad
 2021-10-18 18:15:50 +00:00
Treehugger Robot
210da8ceef Merge "[Telephony] Add more javadoc for carrier privileges" 2021-10-18 17:47:42 +00:00
Trevor Radcliffe
6f519663ad Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 am: a65c3d15f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I7a66c1555658ce241783df4f0b47817f9df8e91c
 2021-10-18 16:55:38 +00:00
Trevor Radcliffe
0e56995dba Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a am: de5eff0206 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: I762c710fdce0f95a05e366e1a971f00f1eddb62d
 2021-10-18 16:55:26 +00:00
Trevor Radcliffe
a65c3d15f0 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb am: 226f91ed89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I149f0dea7e0f021c9dcf4e787aa95006a7a1048b
 2021-10-18 16:46:35 +00:00
Trevor Radcliffe
de5eff0206 Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a am: 012fc9b01a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: Ifa5320b3c151200054998a328af70c59eaf53a9c
 2021-10-18 16:46:26 +00:00
Trevor Radcliffe
226f91ed89 Merge "Migrate LockTaskTests to Soong" am: 106fa79deb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857983

Change-Id: I1106728f0179d95ac2002e32528f3d51ab19f37c
 2021-10-18 16:29:14 +00:00
Trevor Radcliffe
012fc9b01a Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" am: 770099002a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856813

Change-Id: Id4cc4a6dbaaa5c566a864c4eb8a468b28b8b41ff
 2021-10-18 16:28:25 +00:00
Zoey Chen
9b66398997 [Telephony] Add more javadoc for carrier privileges 
Bug: 192252210
Change-Id: I9f43b7ba2e0184d48149a3496559a4be6d07cf6a
Merged-In: I9f43b7ba2e0184d48149a3496559a4be6d07cf6a
Test: manual
 2021-10-18 16:22:57 +00:00
Trevor Radcliffe
106fa79deb Merge "Migrate LockTaskTests to Soong" 2021-10-18 16:13:22 +00:00
Trevor Radcliffe
770099002a Merge "Migrate DynamicCodeLoggerIntegrationTests to Soong" 2021-10-18 16:12:52 +00:00
Grzegorz Kołodziejczyk
ad46dc5b5e server/audio: Add LeAudio support 
This patch adds handling active device and set volume

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual
Change-Id: I50a966ed2f199464381ff561fd83342b0a9b08a9
 2021-10-18 14:32:45 +00:00
TreeHugger Robot
79897f0cb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 5ae87e3a49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93ade8745f022bb6794aed883c75e3b5d203e737
 2021-10-18 08:32:16 +00:00
TreeHugger Robot
d4a917b428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: e53b569e36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5eaa3cc65da6a28d354ecf322d2d8bc6022ad35
 2021-10-18 08:32:05 +00:00
TreeHugger Robot
413382368c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 0773dbc8d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5244cd4e105902f83f3bbad5393dbe13a5f6fce
 2021-10-18 08:30:57 +00:00
TreeHugger Robot
e6abf31f19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours am: 7de25b844e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85738ab43e9a397a6a09f3115156e20cb4245c4b
 2021-10-18 08:21:42 +00:00
TreeHugger Robot
749e698b1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours am: eac5554e0e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib83550590f1a4c7c04363174f6766d9961a35c22
 2021-10-18 08:21:31 +00:00
TreeHugger Robot
3684e58ea6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours am: 91104ba033 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie394697113df112cf781a764a0dd7e4b90ef0719
 2021-10-18 08:21:19 +00:00
TreeHugger Robot
b68cd6f855 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6e2bdea60b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1e0f634f828e626173b388a6468bc2ffadefa1b
 2021-10-18 08:21:04 +00:00
TreeHugger Robot
7de25b844e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09531314dadf75688383e530883281456fd89827
 2021-10-18 08:21:02 +00:00
TreeHugger Robot
4d2484b951 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3996156430 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0064ad11629035618e4752a43042ecfcf405edce
 2021-10-18 08:20:50 +00:00
TreeHugger Robot
eac5554e0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib95921e11ed0b8fa2c3b5150d87f08c67815e169
 2021-10-18 08:20:49 +00:00
TreeHugger Robot
09b1538b18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b93235188a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a9a24983c398e41eb4ef281adfa4437b29af851
 2021-10-18 08:20:16 +00:00
TreeHugger Robot
91104ba033 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a1d8e8049d763bac5e83d7ef65c95d5b7209258
 2021-10-18 08:19:55 +00:00
TreeHugger Robot
5ae87e3a49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 53e6f9e01a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I178aac3336e65137e63ddc8cd6075a308444722a
 2021-10-18 08:19:36 +00:00
TreeHugger Robot
e53b569e36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3986695d05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b21ddd04cbac9d0cc2bf8cf9098190acaec42e0
 2021-10-18 08:19:23 +00:00
TreeHugger Robot
0773dbc8d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c499631f1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I059f80bb0ac9bfa32ad83445a5264433fb079332
 2021-10-18 08:18:53 +00:00
TreeHugger Robot
53e6f9e01a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-18 08:06:08 +00:00
TreeHugger Robot
6e2bdea60b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:06:06 +00:00
TreeHugger Robot
3996156430 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:04:42 +00:00
TreeHugger Robot
3986695d05 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-18 08:03:57 +00:00
TreeHugger Robot
c499631f1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-18 08:03:55 +00:00
TreeHugger Robot
b93235188a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-18 08:03:53 +00:00
Treehugger Robot
821bb80688 Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Iff381892048ab02b6df2d92dc8d2c687b9f7bc88
 2021-10-18 03:11:49 +00:00
Treehugger Robot
dd769fedab Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Ib73d56621f5ba8f01917443a9aa1dd78812aa72c
 2021-10-18 02:59:24 +00:00
Treehugger Robot
1017b74861 Merge "Fix Configuration.diff documentation." am: f822fdf129 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: I1b397e038895c04108cdad48e0fb4ddfd48e0d67
 2021-10-18 02:44:38 +00:00
Treehugger Robot
f822fdf129 Merge "Fix Configuration.diff documentation." 2021-10-18 02:27:58 +00:00
Jakub Pawlowski
c0ef417381 Merge "server/audio: Add Le audio messages to MESSAGE_MUTE_MUSIC" am: 3e6f16c19f am: c4bf08a2f2 am: 98c73c2038 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859353

Change-Id: I85aa757c701b973865f9c1428f717bb388e3400e
 2021-10-16 11:30:29 +00:00
Jakub Pawlowski
98c73c2038 Merge "server/audio: Add Le audio messages to MESSAGE_MUTE_MUSIC" am: 3e6f16c19f am: c4bf08a2f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859353

Change-Id: I8536311afbafee3800ef7894b153480c919c6697
 2021-10-16 11:08:02 +00:00