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

589776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sally
ef5f38e77b Add API for setting a content description for BigPictureStyle's picture 
BigPictureStyle allows devs to attach a big picture image to their
notifications. Since images can have content descriptions, allow devs
to add content descriptions to the big picture image for a11y

Bug: b/147295675
Test: atest NotificationManagerTest; created a notification and
tested with TalkBack

Change-Id: Ibdf9d67a7d9a8c3a60b2560c3be6dde93247b7ac
 2020-11-01 23:15:14 +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
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