Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
723,781 Commits 3 Branches 0 Tags
45fe9d2bfb13710ca4ced4e333fd73172a11bcc0
Commit Graph

723781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
45fe9d2bfb Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-mainline-prod am: 655feee49d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960232

Change-Id: Ie7bb3cded0533d5757d9ea5cc297b6aebd12fac4
 2021-10-02 18:00:29 +00:00
TreeHugger Robot
17dbb56e4d Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 2p: 19cc11f443
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 17:49:17 +00:00
TreeHugger Robot
655feee49d Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 17:49:17 +00:00
Bill Yi
ae557f067a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 16:34:23 +00:00
TreeHugger Robot
d26ca7d927 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 965c049c07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d8675fff74fe3ce6fc0a291dd0f6903c30eb736
 2021-10-02 09:23:55 +00:00
TreeHugger Robot
965c049c07 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 09:12:59 +00:00
TreeHugger Robot
bd260ccf06 Merge changes from topic "presubmit-am-f1204d8f9abe4b26a7b30d02cbfef8c4" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1c362c99c
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 09:12:59 +00:00
TreeHugger Robot
45287a9971 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 09:04:13 +00:00
TreeHugger Robot
b4023c56b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d1bb47345d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9abc1ea1300101a27429ff23bd5bf1ae75499d42
 2021-10-02 08:10:33 +00:00
TreeHugger Robot
22fae928e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0aa9fdd9c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e341e6e3cfba76e7400f72b9e4f081d6544417d
 2021-10-02 08:09:25 +00:00
TreeHugger Robot
d1bb47345d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 07:58:47 +00:00
TreeHugger Robot
3963ffb3e7 Merge changes from topic "presubmit-am-57e77ba2643340768cd486f43a54b29a" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 043bdfb3c0
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 07:58:47 +00:00
TreeHugger Robot
0aa9fdd9c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-10-02 07:54:44 +00:00
TreeHugger Robot
ebe15ce76e Merge changes from topic "presubmit-am-ecf0dda706ee46a9b0c9658a248e3292" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4664b90670
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 07:54:44 +00:00
TreeHugger Robot
2f760bfce9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 07:35:12 +00:00
TreeHugger Robot
1523c3a079 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 07:13:14 +00:00
TreeHugger Robot
78cbb9d7d9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-10-02 06:53:32 +00:00
Bill Yi
d0da80fdcd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5013d5de42cbc48732563241759e8f73a99486e1
 2021-10-02 03:46:06 +00:00
Evan Severson
2c357a62f6 Merge "Refactor sensor use dialog to show above applications" into sc-dev am: 10670dd872 am: 7ef20c8744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15851330

Change-Id: I6e7204df1ebafc941b91092e6be3aacc17b4645f
 2021-10-02 00:08:35 +00:00
Evan Severson
7ef20c8744 Merge "Refactor sensor use dialog to show above applications" into sc-dev am: 10670dd872 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15851330

Change-Id: I694c7afb201ddb63ad4ed9df0e17f5038d28c70b
 2021-10-01 23:54:30 +00:00
Evan Severson
10670dd872 Merge "Refactor sensor use dialog to show above applications" into sc-dev 2021-10-01 23:46:07 +00:00
Mikhail Naganov
3f35c2b2a9 Merge "Add AudioPort* to android.media.audio.common" 2021-10-01 23:13:55 +00:00
Bill Yi
a2b4bce778 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I218f9450771bff5a898a06675550bd16d16491a8
 2021-10-01 21:49:46 +00:00
Bill Yi
a06eda3eb1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4664b90670 
Blank merge reason: commit message contains skip directive

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

Change-Id: I41eae38e4ee2faf699ff091ef962510a0ffe0f62
 2021-10-01 21:37:52 +00:00
Bill Yi
4664b90670 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I97c982daeea81bbdb64c0bc7d3ba5bb29eb5082d
 2021-10-01 21:37:32 +00:00
TreeHugger Robot
a864909e88 Merge "Add the systemserver_fragment to media SDK." 2021-10-01 21:31:58 +00:00
TreeHugger Robot
1ee08c89bd Merge "Fix FD ownership issue in test" 2021-10-01 21:19:57 +00:00
TreeHugger Robot
8d73377516 Merge "[DO NOT MERGE] Make sure smartspace connects when added" 2021-10-01 20:10:46 +00:00
Ytai Ben-Tsvi
b7c82a021c Fix FD ownership issue in test 
Fixes: 201657372
Test: atest FrameworksServicesTests:com.android.server.soundtrigger_middleware.SoundHw2CompatTest
Change-Id: Ifc8db3704b3b92b47114c27787382a139dc82990
 2021-10-01 12:40:18 -07:00
Gaurav Bhola
98166b263b Merge "Remove all the files from frameworks/base/data/etc/car" 2021-10-01 19:17:00 +00:00
Bill Yi
3ba67657c7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 2p: 19cc11f443 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ic911a0a58d7ffe64eb82e7afe2ca1075d27f12f6
 2021-10-01 19:03:39 +00:00
Bill Yi
19cc11f443 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d35cf4d0 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1ef33f9a574c85f3d9165bd776ab4627c7c64eda
 2021-10-01 19:03:25 +00:00
Bill Yi
c9d35cf4d0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib246fb025736e4699ed1d610f7d6b0ec7eb13f20
 2021-10-01 19:03:08 +00:00
Bill Yi
350a58aa92 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I749aa6887070a3802fcd11396e802bee90667dc7
 2021-10-01 19:01:13 +00:00
Chavi Weingarten
e55fbe4ea9 Merge "Update setBuffer to use the new setBuffer API" 2021-10-01 17:43:00 +00:00
Bill Yi
fff75b88a7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ff4e43f3338a6c0083e3997a4da2a6af79b1fed
 2021-10-01 17:41:17 +00:00
Bill Yi
65bc78ab41 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I370396fd367b2159dfb11e7c3e6743c4a86bf5ef
 2021-10-01 17:39:15 +00:00
Bill Yi
38e731374e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 043bdfb3c0 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ifac838a511af76131d048fb5941019f5857122b0
 2021-10-01 17:36:56 +00:00
Bill Yi
043bdfb3c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I13934284216e6b586a95884c44f4377d0e4a813c
 2021-10-01 17:36:37 +00:00
Bill Yi
fac4092d3b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f1c362c99c 
Blank merge reason: commit message contains skip directive

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

Change-Id: If15832a892c4581c82db8bbadd5f5a25fc86a2b2
 2021-10-01 17:21:19 +00:00
Bill Yi
f1c362c99c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ed97775156806b879e6675f8c8baf059377e3fe
 2021-10-01 17:21:08 +00:00
Matt Pietal
f65b1a7269 [DO NOT MERGE] Make sure smartspace connects when added 
And disconnects when there's no views attached.

Fixes: 201564901
Fixes: 201546735
Test: atest LockscreenSmartspaceControllerTest
Change-Id: I66206b127114484b3c47abe98c6bd2ddafe99b61
(cherry picked from commit 5739b63774)
 2021-10-01 17:09:47 +00:00
Patrick Baumann
8a5d660c41 Merge "Fix the overrides file corruption due to shutdown" 2021-10-01 16:38:39 +00:00
Li Li
5c846c1d8f Merge "Freezer: don't skip processes with file locks" 2021-10-01 15:31:29 +00:00
TreeHugger Robot
9de0c59064 Merge "Smartspace - Don't connect until setup" 2021-10-01 14:50:11 +00:00
TreeHugger Robot
78a5d3d007 Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev am: 475584bd10 am: 9cf5a2d6ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934230

Change-Id: I8c87742699cd8179510ffdd0d2c8482c12f9d9e6
 2021-10-01 13:59:00 +00:00
TreeHugger Robot
9cf5a2d6ae Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev am: 475584bd10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934230

Change-Id: I97fb5e6d723f00bf042e40fafa48ffea2393c6f1
 2021-10-01 13:54:36 +00:00
Mohammad Islam
7c7383d982 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours am: c240dd3e01 -s ours am: dca6914696 -s ours am: f35b7fe044 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: Ifb35040a0e591ab4fafbb43b72889b5f5acdeb46
 2021-10-01 13:53:53 +00:00
Mohammad Islam
f35b7fe044 [automerger skipped] Merge "libbinder: split out PackageManagerNative aidl" am: cbe9af5ab5 -s ours am: c0da9473bc -s ours am: c240dd3e01 -s ours am: dca6914696 -s ours 
am skip reason: Merged-In Ie64fb3502d8e5164df4710feb2f525db7c4234a2 with SHA-1 bdbf40efd6 is already in history

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

Change-Id: I67b658dabeb627b8f01cfe20d79584a451708d6b
 2021-10-01 13:40:44 +00:00
TreeHugger Robot
475584bd10 Merge "Letterbox Reachability: Add a central stop for repositioning." into sc-v2-dev 2021-10-01 13:40:26 +00:00