Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
632,542 Commits 3 Branches 0 Tags
6d7cbf74f6607a43a0f704ddf5e6fcd5fed413ba
Commit Graph

632542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Myren
6d7cbf74f6 Add Api to get permission group info from PermissionController 
Bug: 182094776
Test: atest GetPermissionGroupInfoTest
Change-Id: I872b0658ea0d8a5aca80a83cff1e29f25b7d6d3d
 2021-03-31 09:31:47 -07:00
Kweku Adams
e3585e106f Merge "Log EJ status to statsd." into sc-dev 2021-03-29 16:21:48 +00:00
Kweku Adams
5edea1db06 Merge "Remove NetworkPolicyManager listener." into sc-dev 2021-03-29 16:21:13 +00:00
Lucas Dupin
10c1b4f3f9 Merge "Add luma capabilities to ColorStateList" into sc-dev 2021-03-29 15:47:05 +00:00
Jordan Demeulenaere
4f7a421069 Merge "Revert "Swipe notification to edge of screen"" into sc-dev 2021-03-29 15:28:37 +00:00
Joanne Chung
2e3ea6a2ab Merge "Add translation APIs for virtual views." into sc-dev 2021-03-29 15:28:23 +00:00
Junyu Lai
18d2238fa1 [automerger skipped] Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631 am: fc5e6eded5 -s ours 
am skip reason: skip tag Change-Id I073934f3ac4d13b569ea3a295692c76451b7bbfa with SHA-1 5acc19c9ad is already in history

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

Change-Id: Iaccf6206d27f5cd1adf9a348deb9da58829c38b9
 2021-03-29 15:01:10 +00:00
Jacqueline Bronger
2873f10133 Merge changes from topic "leanback_dialog_background" into sc-dev 
* changes:
  Change leanback dialog backgrounds.
  Remove light leanback dialog themes.
 2021-03-29 14:46:14 +00:00
Beverly Tai
18f543c54d Merge "Cannot determine Doze state during transition" into sc-dev 2021-03-29 14:34:15 +00:00
Junyu Lai
fc5e6eded5 Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 am: 37dcb82631 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: I73805c127c9a20de1e502ccedfd65195c76a6b6a
 2021-03-29 14:16:37 +00:00
Kriti Dang
2b5b144ed0 Merge "Hdr format settings [Backend]" into sc-dev 2021-03-29 13:33:57 +00:00
Junyu Lai
37dcb82631 Merge "[SP29.1] Simplify logic of calculating and applying data limit" am: 6b9470ffc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652211

Change-Id: Ie0f37b03ca6644d4be1de95b6ee9396dac101fe4
 2021-03-29 13:32:36 +00:00
Kriti Dang
7010f95cb2 Hdr format settings [Backend] 
Adding new APIs in display manager to get the user disabled formats, to get the formats
supported by device and get formats reported by display.

Bug: 172905874
Test: N/A
Change-Id: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
Merged-In: I58a7714f03a3e165bbd22f2fa7a021ad90b41b39
(cherry picked from commit 25f1822005)
 2021-03-29 13:21:14 +00:00
Frank Li
f076e68439 [automerger skipped] Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a am: 0616526072 -s ours 
am skip reason: skip tag Change-Id Ie0fd5ba816c390bfb7bc6512d896a88482c217ec with SHA-1 37dff3b28a is already in history

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

Change-Id: Ie95c3a94fa2a7e730ad43fa545dc82cf20c0e1bd
 2021-03-29 12:58:19 +00:00
lifr
9039c976bf [automerger skipped] [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964 am: 8ca2d02922 am: 59cd6f3076 -s ours 
am skip reason: skip tag Change-Id I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c with SHA-1 03f6fd2052 is already in history

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

Change-Id: I627119002e2d4230939d2017728959934f14a528
 2021-03-29 12:58:09 +00:00
Junyu Lai
d1d8c41c6f [automerger skipped] Merge "[SP28] Add API for set data warning" am: ac196a1e07 am: e6b40ed4ca am: d5607d27e9 -s ours 
am skip reason: skip tag Change-Id I6ee661497f7dedb871c85786d1950cab951d8aa2 with SHA-1 ac1da4d565 is already in history

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

Change-Id: I9c0734c571f46d0211fe013198d37defe323fd62
 2021-03-29 12:57:39 +00:00
Junyu Lai
6b9470ffc4 Merge "[SP29.1] Simplify logic of calculating and applying data limit" 2021-03-29 12:47:08 +00:00
Ryan Lin
b9822aba4a Merge "remove period at the end of the subttext" into sc-dev 2021-03-29 12:46:06 +00:00
Sudheer Shanka
a8c60abc86 Merge "Make a couple of constants in MediaSessionService configurable." into sc-dev 2021-03-29 12:37:55 +00:00
Joanne Chung
e1b23cd423 Add translation APIs for virtual views. 
Bug: 178046780
Test: manual
Test: atest CtsTranslationTestCases
CTS-Coverage-Bug: 177960696

Change-Id: I99caed0d42b3a164a25c2707eba7057c42c19140
 2021-03-29 20:36:40 +08:00
Frank Li
0616526072 Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 am: bc5395e42a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917

Change-Id: If099f376bfd5d456e938612005c4008b0beae91a
 2021-03-29 12:14:01 +00:00
lifr
59cd6f3076 [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964 am: 8ca2d02922 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: Id2679c6437a31718fb7612b07712bf8cef7fa293
 2021-03-29 12:13:51 +00:00
Junyu Lai
d5607d27e9 Merge "[SP28] Add API for set data warning" am: ac196a1e07 am: e6b40ed4ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: I43fa10034699732b6091fe290a4e064478c8a0e1
 2021-03-29 12:12:19 +00:00
Jordan Demeulenaere
2b8b48c1e3 Revert "Swipe notification to edge of screen" 
This reverts commit 693ac17880.

Reason for revert: This breaks the notification outline during the expand animation. See b/171817112#comment19 for videos.

Change-Id: I671e4bb10bdc8c7e068ced2eb11c2b8b477b534b
 2021-03-29 11:59:05 +00:00
Selim Cinek
396cf5e224 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245 am: 7bd1fed397 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I52c324890ffdda162d116c40311c95b9c7628dd3
 2021-03-29 11:55:59 +00:00
TreeHugger Robot
894cde1030 Merge "[Settings] add readable tests to presubmit" into sc-dev 2021-03-29 11:52:22 +00:00
Peter Li
378b540fa1 Merge "Add callback to report HotwordDetectionService status" into sc-dev 2021-03-29 11:43:29 +00:00
Frank Li
bc5395e42a Merge changes from topic "NetworkAgent02" am: 31e7ebdd30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917

Change-Id: If59df525be2483064976d3919cf7033fb94e41e6
 2021-03-29 11:43:14 +00:00
lifr
8ca2d02922 [TL02]Remove hidden API usage of NetworkAgent am: 0befda4964 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722

Change-Id: I12342dc4c4ee8748396b7ced2f344611704caa2d
 2021-03-29 11:39:55 +00:00
Junyu Lai
e6b40ed4ca Merge "[SP28] Add API for set data warning" am: ac196a1e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125

Change-Id: Ibdf919a762952350dc89bda59724b2f0cb291313
 2021-03-29 11:30:37 +00:00
Selim Cinek
7bd1fed397 Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I30c4cdd28db679f99eac2f1688270b6ffad35573
 2021-03-29 11:09:51 +00:00
Frank Li
31e7ebdd30 Merge changes from topic "NetworkAgent02" 
* changes:
  Fix cannot success verify count of the networkAgent Config items on R device
  [TL02]Remove hidden API usage of NetworkAgent
 2021-03-29 11:08:24 +00:00
Junyu Lai
ac196a1e07 Merge "[SP28] Add API for set data warning" 2021-03-29 11:06:05 +00:00
Jeff Chang
d4a142719e Merge "Update saving persistent state documentation" into sc-dev 2021-03-29 10:57:28 +00:00
Selim Cinek
386db4c245 Merge "Updating owners of SystemUI" am: 66712466b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624440

Change-Id: I8343f86cdda12c6dd8140eb65a32f7488f8e1ab3
 2021-03-29 10:30:29 +00:00
Selim Cinek
66712466b3 Merge "Updating owners of SystemUI" 2021-03-29 09:45:19 +00:00
lpeter
6f2a263810 Add callback to report HotwordDetectionService status 
Bug: 182788844
Test: Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Change-Id: I12f0a265fc4fce0bbfe0983f39b4dcd947e3cf64
 2021-03-29 17:41:24 +08:00
Nicolas Geoffray
b6521e0a8b Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460 am: 001d7943cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: I64ebc619fb75e53a25f0f669b59e24413089e94b
 2021-03-29 09:05:55 +00:00
Nicolas Geoffray
001566a3bb Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 am: c17f106404 am: 2e17b07d50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: I1fd76cc9165b20dccecea76f747f3a20a3c003bb
 2021-03-29 09:05:42 +00:00
Junyu Lai
d8d97df24f Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 am: a62eb108fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
 2021-03-29 09:05:02 +00:00
Nicolas Geoffray
001d7943cb Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 am: 7e6f612460 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: Ie1729ab482bb3b3559d66c28b37de7a3cb110679
 2021-03-29 08:26:59 +00:00
Nicolas Geoffray
2e17b07d50 Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 am: c17f106404 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: Iee6d1f3bad1c34790af3c954a29aaaebcb00d69c
 2021-03-29 08:26:57 +00:00
Junyu Lai
a62eb108fa Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Iaa7d8d3dcb106cd19777fe1ff64db5ab4ea75991
 2021-03-29 08:26:07 +00:00
Sean Stout
97effb798d Merge "Update Wakelocks to be per-DisplayGroup" into sc-dev 2021-03-29 08:18:28 +00:00
Nicolas Geoffray
7e6f612460 Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." am: f89bea0b69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646527

Change-Id: I400b0c16ee56ed02f1b12d1e5ba55a1f0fffe82b
 2021-03-29 08:07:25 +00:00
Nicolas Geoffray
c17f106404 Merge "When a pinned file is a jar or apk, ask the runtime for other files." am: 03faaa5843 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646526

Change-Id: I73ee02845783e7869fc3f941fe2c81bc155f3846
 2021-03-29 08:05:43 +00:00
Nicolas Geoffray
f89bea0b69 Merge "Remove obsolete config_jitzygoteBootImagePinnerServiceFiles." 2021-03-29 07:47:43 +00:00
Nicolas Geoffray
03faaa5843 Merge "When a pinned file is a jar or apk, ask the runtime for other files." 2021-03-29 07:47:43 +00:00
Junyu Lai
dfcdeef584 Merge "Support Dual ViLTE stats" am: e456a6c3f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Ie65e2a2530b3e10b1cb7b571bbe4e7255caf1b08
 2021-03-29 07:37:34 +00:00
lifr
d5eb5cdcbc Fix cannot success verify count of the networkAgent Config items on R 
device

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Fix: 183474500
Change-Id: Ie0fd5ba816c390bfb7bc6512d896a88482c217ec
Merged-In: Ie0fd5ba816c390bfb7bc6512d896a88482c217ec
 2021-03-29 15:36:32 +08:00