Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
589,789 Commits 3 Branches 0 Tags
55a61c0443dce8c0ac787143c19058a65450b2ea
Commit Graph

589789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
55a61c0443 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8c93c6c3d1 -s ours am: c3de3e3151 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie254fc8b7a36121ade30953343bfc9508a8393cc
 2020-10-31 03:11:50 +00:00
TreeHugger Robot
cff87fd839 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 0dab5b2c88 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I793085df73238aeee88b505f890f3d5ee3cec3f4
 2020-10-31 03:11:04 +00:00
TreeHugger Robot
c3de3e3151 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8c93c6c3d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I922172130512e5ce95d0e6baf20537f6d3e3adfa
 2020-10-31 02:55:25 +00:00
TreeHugger Robot
0dab5b2c88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbf8ebffd44b7f946df6a9a9a4423390e1a23e2d
 2020-10-31 02:55:06 +00:00
TreeHugger Robot
8c93c6c3d1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-31 02:30:53 +00:00
Tobias Thierer
64ef203430 Merge "Backup platform: Update OWNERS." am: 0be136593e am: 04af92eeba am: 6acfa90ddd am: e934630b7d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479959

Change-Id: I5aac33c47184c4a383c43d2e0cbe9a08d3946165
 2020-10-31 02:30:37 +00:00
TreeHugger Robot
b630b27967 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-31 02:28:13 +00:00
Tobias Thierer
e934630b7d Merge "Backup platform: Update OWNERS." am: 0be136593e am: 04af92eeba am: 6acfa90ddd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479959

Change-Id: I9538bd821e9468a01bcb50aed3a95718cf2ba135
 2020-10-31 02:03:45 +00:00
Tobias Thierer
6acfa90ddd Merge "Backup platform: Update OWNERS." am: 0be136593e am: 04af92eeba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479959

Change-Id: I785a8988c233d9963460ace4c51d0111e70d4f3a
 2020-10-31 01:52:51 +00:00
Tobias Thierer
04af92eeba Merge "Backup platform: Update OWNERS." am: 0be136593e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479959

Change-Id: I8a155160e2c2bb7201db1021e0b5540380b470f3
 2020-10-31 01:40:09 +00:00
Tobias Thierer
0be136593e Merge "Backup platform: Update OWNERS." 2020-10-31 01:08:22 +00:00
Bill Yi
84e5cae5e8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I652ec2029d0205de82b618fecec7e99a26b1bbd7
 2020-10-31 00:37:18 +00:00
Bill Yi
88e5295c19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32fb3eb86802d50d1effb1db4b311a14c73dcadc
 2020-10-31 00:12:59 +00:00
Evan Rosky
87e1f782f4 Merge "Clean-up usage of shared applyTransaction function" 2020-10-30 22:33:07 +00:00
Sudheer Shanka
3bb8807811 [automerger skipped] Merge "NPMS lock improvement." am: 053893568a am: cada17643d am: 388fe5f626 am: adb3c332fd -s ours 
am skip reason: Change-Id Ibbb4325c7380a2febf3682b3ae3436647ae82e16 with SHA-1 6030b6681e is in history

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

Change-Id: I585390decb4b6db6bc0d9469fe8ff2329b5308da
 2020-10-30 22:30:42 +00:00
Emilian Peev
ab1a86bf3c Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd am: b8a7381930 am: dbbcb14f06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: I707c029ac2ed1b540625a0089ee33c7258145373
 2020-10-30 22:30:03 +00:00
Sudheer Shanka
adb3c332fd Merge "NPMS lock improvement." am: 053893568a am: cada17643d am: 388fe5f626 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480258

Change-Id: Ia0a79dc25e9bc08e572fa5a37fb5f821bd7bbfcf
 2020-10-30 22:25:03 +00:00
Emilian Peev
dbbcb14f06 Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd am: b8a7381930 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Iba02e5a7e7936e93923fcd891a91be9e874888a0
 2020-10-30 22:24:17 +00:00
Anton Hansson
831a34a647 [automerger skipped] Merge "resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: f297e4494a -s ours 
am skip reason: Change-Id I843efb4880b6caaf3872e9b0918fd710fb93d979 with SHA-1 6cbaff2471 is in history

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

Change-Id: I26b3acb49b3b07bd67cc921c811ddeea8964caaa
 2020-10-30 22:24:08 +00:00
TreeHugger Robot
e79d7e5fc4 Merge changes I75290c1c,I8d1c8b64 
* changes:
  Finish cleaning up locking inside PermissionManagerService.
  Remove locking inside PermissionRegistry.
 2020-10-30 21:53:07 +00:00
Anton Hansson
f297e4494a Merge "resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp 2020-10-30 20:39:32 +00:00
Shuo Qian
6e59ac63ff [automerger skipped] Merge "Try to add AppOps Keys into Proto to unblock my project" into rvc-qpr-dev-plus-aosp am: 18a450a92b -s ours 
am skip reason: Change-Id Ibd0f85575c9bc3d7aca9d5b011f1e5f0cbf960c1 with SHA-1 503ee6ad3b is in history

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

Change-Id: Ia8819751a64057d17fac2e3d8d2b1daaa8187886
 2020-10-30 20:26:06 +00:00
Shuo Qian
18a450a92b Merge "Try to add AppOps Keys into Proto to unblock my project" into rvc-qpr-dev-plus-aosp 2020-10-30 20:21:14 +00:00
Sudheer Shanka
388fe5f626 Merge "NPMS lock improvement." am: 053893568a am: cada17643d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480258

Change-Id: I2ba5d0c42f9d5cfa9fa64996a7fcb9ce2c7a8f76
 2020-10-30 19:48:17 +00:00
Sudheer Shanka
cada17643d Merge "NPMS lock improvement." am: 053893568a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480258

Change-Id: I961b2ea8aead71b92241496fd24d12fc301b13bf
 2020-10-30 19:35:48 +00:00
Baligh Uddin
e8c64853db [automerger skipped] Fix visibility rule. am: 1f9ca72364 -s ours 
am skip reason: Change-Id If00767d0fefb35bba8633a594a0e5b26b2e64e12 with SHA-1 ab93bef800 is in history

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

Change-Id: Ie08d1d17d7f70aa1e8d89c88757f25bdbc7af053
 2020-10-30 19:35:04 +00:00
TreeHugger Robot
0072beaf70 Merge "WindowMagnificationAnimationControllerTest fails" 2020-10-30 18:54:30 +00:00
Sudheer Shanka
053893568a Merge "NPMS lock improvement." 2020-10-30 18:40:01 +00:00
Rob Carr
79510c2b35 Merge "WindowManager: Move mGlobalScale application to WindowState" 2020-10-30 17:41:29 +00:00
Baligh Uddin
1f9ca72364 Fix visibility rule. 
Issue identified in ag/12956706

BUG: 167962976
Test: TH
Merged-In: If00767d0fefb35bba8633a594a0e5b26b2e64e12
Change-Id: I469774c85b4864a325a89338a2dc58e706dd7432
 2020-10-30 17:23:18 +00:00
Emilian Peev
b8a7381930 Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Ib1beca7fcfb3d0d512828e04a6ebf12dea6d3920
 2020-10-30 17:18:41 +00:00
Anton Hansson
024ea641db resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp 
Bug: 171029603
Test: No
Change-Id: I94146ebaf21cabd54105059fee3f07ba4043aa76
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
 2020-10-30 17:02:14 +00:00
TreeHugger Robot
b41548eb6b Merge "Do not allow uninstalling while an app is pinned" 2020-10-30 16:55:50 +00:00
Emilian Peev
ce1dd0aafd Merge "Expose Image and Plane for testing" am: 56804f0560 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Ic6ad221e6102a81333deb49b0ca33b3b9a4067a3
 2020-10-30 16:40:22 +00:00
Baligh Uddin
5135242fcf [automerger skipped] Fix visibility rules for packages/modules/Connectivity am: ab93bef800 -s ours 
am skip reason: Change-Id I476629002e075d01c83f77be8343157dbd66ce9b with SHA-1 67b2e68a7c is in history

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

Change-Id: I85aa62f65b6c577c20226f9020f5b27aed5b4d0e
 2020-10-30 16:39:42 +00:00
Anton Hansson
887f4fbc74 Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 am: d6987e84d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480537

Change-Id: I9aafe5b87236abfbe019f6297dcb31a7cc900957
 2020-10-30 16:11:57 +00:00
Emilian Peev
56804f0560 Merge "Expose Image and Plane for testing" 2020-10-30 16:10:30 +00:00
Baligh Uddin
ab93bef800 Fix visibility rules for packages/modules/Connectivity 
BUG: 167962976
Test: TH
Merged-In: I476629002e075d01c83f77be8343157dbd66ce9b
Change-Id: If00767d0fefb35bba8633a594a0e5b26b2e64e12
 2020-10-30 16:08:18 +00:00
TreeHugger Robot
98bb82ce11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2270f05e08 -s ours am: ec0c0bde4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2dc1818e77853644b9327b770b17103727336d9
 2020-10-30 16:06:20 +00:00
Daniel Bright
394775b1b9 Merge "Add HAL for pdu session id support" 2020-10-30 16:06:04 +00:00
Chavi Weingarten
77672d8cd1 Merge "Add uid to CaptureArgs." 2020-10-30 15:57:37 +00:00
Anton Hansson
d6987e84d5 Merge "Move non-updatable-api/ to core/api/" am: ad2bb796b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480537

Change-Id: I636de254b4d7dd9c8f7ffe4cb55a12ada1fcf53b
 2020-10-30 15:53:29 +00:00
TreeHugger Robot
ec0c0bde4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2270f05e08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82082b4417fff0cf0ea5ff041a3f802eef29993e
 2020-10-30 15:52:30 +00:00
Beth Thibodeau
37bf178c5b Merge "Downscale recording as needed for device codecs" 2020-10-30 15:34:25 +00:00
Anton Hansson
ad2bb796b0 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 15:22:45 +00:00
TreeHugger Robot
2270f05e08 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-10-30 15:21:21 +00:00
Ricky Wai
cbec226d9a Merge "Revert "Introduce Background Activity Launch home mode"" 2020-10-30 15:11:29 +00:00
Baligh Uddin
a0e5c7b054 [automerger skipped] Restructure Module code [ com.android.tethering ] am: 4afb09db93 -s ours 
am skip reason: Change-Id I2accb96abbdfa665ef34aa79e87af040226bcf32 with SHA-1 c4319b3da4 is in history

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

Change-Id: I1423385124c67bf55535c00bd16b39808e16139e
 2020-10-30 14:50:44 +00:00
Automerger Merge Worker
e074236e3b Merge "[automerger skipped] Merge "Add MediaMetrics support to MediaParser" into mainline-prod am: fd3f41c4b7 -s ours" 2020-10-30 14:50:35 +00:00
Marin Shalamanov
b99b201202 Merge "Fix broken test" 2020-10-30 14:50:25 +00:00