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

589752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Lin
beefdec180 Set PiP stashing to a set 32dp away from the edge of the screen. 
Bug: 165793553
Test: Stash PIP
Change-Id: Ib6e0058a9e0c6b60605c6143e9407ce809abebf3
 2020-10-30 18:19:17 -07: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
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
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
TreeHugger Robot
b41548eb6b Merge "Do not allow uninstalling while an app is pinned" 2020-10-30 16:55:50 +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
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
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
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
Santiago Seifert
5dba2ee60f [automerger skipped] Merge "Add MediaMetrics support to MediaParser" into mainline-prod am: fd3f41c4b7 -s ours 
am skip reason: Change-Id If51ee018da3056231910cd9c18f1b938a5c0e343 with SHA-1 173193000e is in history

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

Change-Id: Ie901400c4d094d5b2cb963192d1c52a8f694cf51
 2020-10-30 14:50:11 +00:00
Baligh Uddin
4afb09db93 Restructure Module code [ com.android.tethering ] 
Code Migration from frameworks/base/packages/Tethering ->
packages/modules/Connectivity/Tethering

BUG: 167962976
Test: TH
Merged-In: I2accb96abbdfa665ef34aa79e87af040226bcf32
Change-Id: Id7656fe7f6a6fae044dc8defd05e83d81c6b8c11
 2020-10-30 14:42:23 +00:00
Santiago Seifert
fd3f41c4b7 Merge "Add MediaMetrics support to MediaParser" into mainline-prod 2020-10-30 14:37:53 +00:00
Corina
5899fe4111 [automerger skipped] DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. am: 39150a7422 am: 6bd2fd910b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa18cf8dd785ea1e0f183f9c8596f1f36c7a73b6
 2020-10-30 13:46:36 +00:00
Alison Cichowlas
0b379c9098 Merge "Always reset viewpager in RTL layouts, whether or not it's tabbed." 2020-10-30 13:35:36 +00:00
TreeHugger Robot
5230154698 Merge "Switch to SystemUI dimen for notification margins." 2020-10-30 13:28:43 +00:00
Corina
6bd2fd910b DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. am: 39150a7422 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12948761

Change-Id: If953e3fd513d43696fd4e3763ee78634ef71751e
 2020-10-30 13:19:49 +00:00
Corina
39150a7422 DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. 
Added TODO to enable this based on MediaProvider version (it needs a
media provider version which includes as certain change.)

Bug: 171491982
Test: No
Change-Id: I717251f351a65255ff73bf782e4f2fce3a67328f
 2020-10-30 13:00:13 +00:00
Les Lee
e97f73dd91 Merge "wifi: Add new capability to indicate mac address customization support" 2020-10-30 12:54:22 +00:00
Ricky Wai
d070c3e5bf Revert "Introduce Background Activity Launch home mode" 
This reverts commit 9268360c70.

Reason for revert: b/172034430

Change-Id: If3d2a2a0ec0ace50d015d35ce5c39d6242a45d2e
 2020-10-30 12:21:47 +00:00
Treehugger Robot
a85a66e6c2 Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b am: adfd73bd18 am: c59b775963 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: Ib82fdb4eb61b7d52e0011271da81c30606dbe3c3
 2020-10-30 11:54:12 +00:00
Treehugger Robot
c59b775963 Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b am: adfd73bd18 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: Ib457623c1d204f8b83918a13c662335b4b9aded0
 2020-10-30 11:25:49 +00:00
Treehugger Robot
adfd73bd18 Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I3663ea2b95ec7815e84fa0729c39591280a90847
 2020-10-30 11:15:15 +00:00
Anton Hansson
5715f92949 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 11:03:28 +00:00
Bill Yi
9fb898e15b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I19ec607aea18666102620348ac4919dd3b6ae0be
 2020-10-30 03:43:40 -07:00
Treehugger Robot
d87326c117 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours am: fe6fd2ea77 -s ours am: 4a418518e7 -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 571a934615 is in history

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

Change-Id: I26b9652e1951f6be776d75707890ed563c6e66ec
 2020-10-30 10:38:16 +00:00
Treehugger Robot
a2699a02e8 Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591 am: 853858890b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: I986e476cfb549ebb6e37fc81f79722b42a98361f
 2020-10-30 10:37:55 +00:00
Treehugger Robot
0e2959a56b Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459882

Change-Id: I1a3b685f04d7b4d7d5a028015e94742c83db2dc8
 2020-10-30 10:37:17 +00:00
Anton Hansson
5cbcb587af Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 am: 0a111c1280 am: 1befdc9e4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I312eb37caed125f12fd3bd8c4e3e1741062b2810
 2020-10-30 10:37:08 +00:00
Neil Fuller
2b775b57f8 Merge "Fix minor code nits" 2020-10-30 10:34:33 +00:00
Neil Fuller
0858987626 Merge "Fix non-deterministic async test" 2020-10-30 10:33:38 +00:00
Treehugger Robot
a13966feea Merge "NetworkNotificationManager gets NotificationManager locally" 2020-10-30 10:21:29 +00:00
Treehugger Robot
4a418518e7 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours am: fe6fd2ea77 -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: Ibba9eafcf65c50cfe52b9d42f6b6d77d67ca886c
 2020-10-30 10:04:43 +00:00
Treehugger Robot
853858890b Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: Ia64761f215a5b353ff961d234994d613412d5d0d
 2020-10-30 10:04:13 +00:00
Anton Hansson
1befdc9e4f Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 am: 0a111c1280 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: Iaaf18128d1c26b928ca4d0cfdfa470c226887ebe
 2020-10-30 10:03:17 +00:00
Treehugger Robot
fe6fd2ea77 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours am: b357c138f5 -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I509d8b350d9fea9757a0740704e401d39ab7f1de
 2020-10-30 09:43:18 +00:00
Treehugger Robot
9149eab591 Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359902

Change-Id: I141384774f55dec9cf72ebc3fd4710766999d4d5
 2020-10-30 09:42:54 +00:00
Anton Hansson
0a111c1280 Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I28c6d399d82936bdedee7a0ccaef009a40fd0b13
 2020-10-30 09:42:17 +00:00
TreeHugger Robot
3c2ca66a53 Merge "Revert "Protect INTENT_BUGREPORT_REQUESTED"" 2020-10-30 09:22:30 +00:00
Treehugger Robot
b357c138f5 [automerger skipped] Merge "Restructure Module code [ com.android.tethering ]" am: c8769826af -s ours 
am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 62822a92cd is in history

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

Change-Id: I47de082b8e60278e8baa8381a384001d636e6f90
 2020-10-30 09:13:35 +00:00