Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
673,309 Commits 3 Branches 0 Tags
465ec74e2f6ef5bc0acc11dd2b34d3d77ccb3bb0
Commit Graph

673309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Odell
465ec74e2f Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev am: 84a7a431cc am: 13b149c56b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935219

Change-Id: I1098ac6009cb9b8a126ab2a0c848f4e1842864bf
 2021-09-29 05:25:31 +00:00
Julian Odell
13b149c56b Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev am: 84a7a431cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935219

Change-Id: I73de6397331655133f2e00ee1580ae09182afd76
 2021-09-29 05:08:35 +00:00
Julian Odell
84a7a431cc Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev 2021-09-29 04:55:18 +00:00
Luke Huang
b8b58e5e7f Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a am: 2c500e21bd am: ecd74849c7 am: 5eea9d8d27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: If445feba49f20bd0f22356e96d1b55548b082576
 2021-09-29 04:40:48 +00:00
Luke Huang
5eea9d8d27 Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a am: 2c500e21bd am: ecd74849c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: Ib6e173d0b68469d596cf8491b729d50ed1f5263a
 2021-09-29 04:26:15 +00:00
Luke Huang
ecd74849c7 Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a am: 2c500e21bd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: I0312c8abb2eb11d8f788ca915a13ba0f23b5430a
 2021-09-29 04:10:28 +00:00
Luke Huang
2c500e21bd Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: Id0f1e097c9903897a35846e0ec6026d29228a39a
 2021-09-29 03:50:49 +00:00
Luke Huang
2adba7dd4a Merge "Keep the native mdns daemon alive for pre-S application" 2021-09-29 03:35:20 +00:00
TreeHugger Robot
909c8050eb Merge "Fixed DPMS.setDeviceOwner() permission check." into sc-v2-dev am: ae8b46904a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15908974

Change-Id: I123078134420ba54ea086bee79d150d774ae3a6c
 2021-09-29 02:59:59 +00:00
TreeHugger Robot
ae8b46904a Merge "Fixed DPMS.setDeviceOwner() permission check." into sc-v2-dev 2021-09-29 02:49:43 +00:00
Edgar Wang
641db01408 Merge "Fix link number increasing in the TalkBack menu." into sc-v2-dev am: 25273478c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926307

Change-Id: Ia20300e9b022f9ba58147b293c807f5b7d8ae417
 2021-09-29 02:19:38 +00:00
Edgar Wang
25273478c7 Merge "Fix link number increasing in the TalkBack menu." into sc-v2-dev 2021-09-29 02:06:41 +00:00
TreeHugger Robot
c9d1899932 Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 am: 7f541b72f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: Ia52e03608a6ce6be927296389bbd84bbe637e89c
 2021-09-29 00:54:52 +00:00
TreeHugger Robot
dad2a6fd9f Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 am: bfe149f2ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: I19fdba5bffb025cb61f4de03fe8cf78c3b7c479b
 2021-09-29 00:54:20 +00:00
TreeHugger Robot
bfe149f2ed Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: Iee9dbf00b4568400c319a348587018bfa3e6fb77
 2021-09-29 00:43:25 +00:00
TreeHugger Robot
7f541b72f7 Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev am: c410f29893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934611

Change-Id: I94e7ba1c4e69ed2140ca49f4542c08e0bbd72573
 2021-09-29 00:43:17 +00:00
TreeHugger Robot
c410f29893 Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev 2021-09-29 00:30:02 +00:00
TreeHugger Robot
010a06ec36 Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce65f am: 984f8fcc51 am: 6cc18eef4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934185

Change-Id: Id9d8bbe2348c12da078f175ec169e18e9e0dcdfe
 2021-09-28 21:59:09 +00:00
TreeHugger Robot
6cc18eef4e Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce65f am: 984f8fcc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934185

Change-Id: I54ac1cd2ebae0d7d32fd16323b4b414fbb9f50eb
 2021-09-28 21:44:46 +00:00
TreeHugger Robot
984f8fcc51 Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master am: f2753ce65f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934185

Change-Id: I2a3ffbc1f1cc6ad96d48cb20a49e87d9a8416032
 2021-09-28 21:26:26 +00:00
TreeHugger Robot
f2753ce65f Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master 2021-09-28 21:09:57 +00:00
Vishnu Nair
1be5898ce7 Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 am: bd61cfb0be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803

Change-Id: I023df7ad8d9ef2bad9cd4c7cc036b4159bdf0fa9
 2021-09-28 21:07:16 +00:00
Vishnu Nair
b866c0323a Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 am: 9bbf9cd727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803

Change-Id: Ic659035d5ed05e2927d672f52b52ee31e87ee9d4
 2021-09-28 21:06:48 +00:00
Vishnu Nair
9bbf9cd727 Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803

Change-Id: I066ec21a0a3874081a3aa17ea7e6a0b9f1bb0ffc
 2021-09-28 20:54:37 +00:00
Vishnu Nair
bd61cfb0be Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev am: 8dc8182ad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934803

Change-Id: I3b7d501067ccdb716ae892fa4ccd34b2722b7ab7
 2021-09-28 20:54:36 +00:00
Vishnu Nair
8dc8182ad0 Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev 2021-09-28 20:38:42 +00:00
Julian Odell
7c3d133d65 Notify content capture on detach before setting attachInfo to null. 
If a view is detached before being removed (which seems common with some
recycler list views) then no content capture view removed event is sent
(notifyAppearedOrDisappearedForContentCaptureIfNeeded does nothing
if mAttachInfo is null).

Fix: 200166989
Test: Manual verification using AiAi logging
Change-Id: Ic04af005bb4ad425ba8398439f1f47bb6bcb334c
 2021-09-28 20:24:07 +00:00
Jorge Gil
42ca299bd4 Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev am: 7c2508117c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15910695

Change-Id: I339ec385c2214fb3e7406c1b6ab4c2986365e46b
 2021-09-28 20:21:41 +00:00
Jorge Gil
7c2508117c Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev 2021-09-28 20:05:53 +00:00
TreeHugger Robot
932a7a167c Merge "Revert "Remove Dependency.get from NavigationBar."" into sc-v2-dev am: b14bcefcb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934625

Change-Id: Ib0d7f8e97b805fede612868780472d1ff83ad6ca
 2021-09-28 19:55:27 +00:00
TreeHugger Robot
b14bcefcb1 Merge "Revert "Remove Dependency.get from NavigationBar."" into sc-v2-dev 2021-09-28 19:37:41 +00:00
Nader Jawad
8bfa3e04a4 Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 am: 15d37532bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060

Change-Id: I97799873785f4480427a25dec70b94f0eb270dca
 2021-09-28 19:20:39 +00:00
Nader Jawad
fd2133a687 Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 am: 201db897ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060

Change-Id: I4e1cde89cc83a6cf4e06131691aea0aaa54dae82
 2021-09-28 19:20:17 +00:00
Nader Jawad
15d37532bf Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060

Change-Id: I601044300fbea039823b2bfad37d59cc4fec6ed5
 2021-09-28 18:40:58 +00:00
Nader Jawad
201db897ea Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev am: be0bdf6178 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926060

Change-Id: Ie233dd9f6628ac6780dd0b96d8eca97d7892b929
 2021-09-28 18:40:56 +00:00
Nader Jawad
be0bdf6178 Merge "Fix initialization of snapshot SkImage instance" into sc-qpr1-dev 2021-09-28 18:24:42 +00:00
Jerry Chang
81504bcc8c Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev am: 05b2d626e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926312

Change-Id: Idf7bcd77ace89a81ce8348ef143eda42bd271f53
 2021-09-28 18:16:29 +00:00
Treehugger Robot
a4f620a730 [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours am: 4895ad6bd9 -s ours 
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: I9acaa94297b0ef31f5c2c78d36c926ab005f10e8
 2021-09-28 18:16:03 +00:00
Jerry Chang
05b2d626e6 Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev 2021-09-28 18:05:34 +00:00
TreeHugger Robot
347557e905 Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev am: 80fcbc8fe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810445

Change-Id: Ibfce3c573e7cc136226599500e438527a1565075
 2021-09-28 18:02:38 +00:00
Treehugger Robot
4895ad6bd9 [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours 
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: I32a4842c436d73a67c98b0e11ce50e05bf54c051
 2021-09-28 17:53:39 +00:00
TreeHugger Robot
80fcbc8fe0 Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev 2021-09-28 17:50:34 +00:00
Vishnu Nair
f0ae9acf36 ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout 
The opaque flag is necessary for the compositor to blend the layers
correctly and prevent translucent pixels from showing the layer
underneath during animations.

Test: manually punch holes in apps and verify opaque apps don't show the layer underneath
Test: automated tests to follow
Bug: 198924563
Change-Id: I1116c51b2efd4e9c0fe2acbca080291f3950245c
 2021-09-28 17:45:10 +00:00
Treehugger Robot
daf25cf47c [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours 
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: Ia7abdd3c4f8222c116a02aed2d6b8052f51c63a5
 2021-09-28 17:44:04 +00:00
Treehugger Robot
5f35a1d2d3 [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours 
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

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

Change-Id: Ia70e96971d08dd32587c38e344e97f145573ba0d
 2021-09-28 17:29:20 +00:00
Dave Mankoff
be525911ce Revert "Remove Dependency.get from NavigationBar." 
This reverts commit 9f8305196c.

Reason for revert: http://b/201416807

Change-Id: Iab917251e00c3ab2ef9f44835728abd93eb16fa5
 2021-09-28 17:23:33 +00:00
Dmitri Plotnikov
fb10be47c9 Zero out WiFi duration and power if ControllerActivityCounter is null 
Bug: 200346841
Test: atest FrameworksCoreTests:WifiPowerCalculatorTest
Change-Id: I087e3b60c277c1d1a63b6c06e60ffcbe95224668
(cherry picked from commit 199f93ac3b)
 2021-09-28 17:20:34 +00:00
Treehugger Robot
d801feda70 Merge "Fix stuck HDMI-CEC actions after boot" 2021-09-28 17:16:41 +00:00
Eric Laurent
947dbfd41c [automerger skipped] Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25 am: 04abcfed22 -s ours 
am skip reason: Merged-In I095224347b5f5c200f4a8f0dd147f63c0119dc85 with SHA-1 c9faa86b66 is already in history

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

Change-Id: Iad6aba98eb0511ad5303164ff7ba367e9c9cf494
 2021-09-28 17:07:36 +00:00
Eric Laurent
9571037530 Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c25 am: 6b85e8e831 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897410

Change-Id: I278f2eaa512ffa5e725c96ae01b4ddc4d03cc53a
 2021-09-28 17:07:02 +00:00