Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
658,354 Commits 3 Branches 0 Tags
ac1e36b59f59084e2d360ce60ffdc6b258d84f4e
Commit Graph

658354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ac1e36b59f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: 7351941662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f1913a66dfc6fa1817f74520ffa8542ee931373
 2021-09-29 17:13:20 +00:00
TreeHugger Robot
d0bfa4c226 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: I151133e723e08ae9bb222970f5ffd81fc9880cd3
 2021-09-29 17:12:59 +00:00
TreeHugger Robot
653e6d8108 Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15925291

Change-Id: Iedc1d581086ed9cc34bb99f801d6823b31767be8
 2021-09-29 17:00:15 +00:00
TreeHugger Robot
cbb7188ae0 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ie556f989ac6ce680b7de6caf37d71c6632ac927b
 2021-09-29 17:00:13 +00:00
TreeHugger Robot
76849b6aea Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev 2021-09-29 16:49:59 +00:00
TreeHugger Robot
d7cef086ca Merge "API renaming asked by API Council" into stage-aosp-master 2021-09-29 16:49:50 +00:00
TreeHugger Robot
ac548fb61e Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: I7dcc13f83b31615c4f6acf88bf9c2c8a4ec9807a
 2021-09-29 13:37:38 +00:00
TreeHugger Robot
af5c64f76f Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev 2021-09-29 13:18:54 +00:00
Etienne Ruffieux
4c70432d82 API renaming asked by API Council 
Renamed all "cancelled" to "canceled" for PendingIntent.

Tag: #feature
Bug: 201405682
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I0f5457f58836c6e80845dcd4d874a810008a320e
 2021-09-29 13:08:09 +00:00
TreeHugger Robot
7cf80aea5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8da71fdf18df035f970276c0380ed6afe58ee6c
 2021-09-29 08:46:20 +00:00
TreeHugger Robot
a63802001e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 08:27:06 +00:00
TreeHugger Robot
5fac21a0d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ec6646989abe7f7ac54cde0e0483a3c05eb58c3
 2021-09-29 06:47:29 +00:00
TreeHugger Robot
4589b798fd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 06:32:42 +00:00
TreeHugger Robot
08aab19778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a0dfaa6f6f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia89842e7f0560307480032e38e5ec80beb91a0f2
 2021-09-29 06:15:07 +00:00
TreeHugger Robot
a0dfaa6f6f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 05:59:11 +00:00
Xin Li
c3a80e0e5f [automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am: 5ae099b977 -s ours am: 9ad5faa913 -s ours 
am skip reason: Merged-In I8b62b9b9d7ae271bc623764d545db1320b4dc64f with SHA-1 6624e2aa57 is already in history

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

Change-Id: I67a30e269da1df1dc163ffd987d64e9cf3368964
 2021-09-29 05:51:59 +00:00
Xin Li
9ad5faa913 [automerger skipped] Merge "Merge SP1A.210812.016" into stage-aosp-master am: 5ae099b977 -s ours 
am skip reason: Merged-In I8b62b9b9d7ae271bc623764d545db1320b4dc64f with SHA-1 6624e2aa57 is already in history

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

Change-Id: I7210bb74378f0bcc925c46f3c75d83fc8aa8741d
 2021-09-29 05:38:38 +00:00
Xin Li
5ae099b977 Merge "Merge SP1A.210812.016" into stage-aosp-master 2021-09-29 05:31:38 +00:00
Winson Chung
7deb5ae50c Merge "Don't factor animating-to-sleep for nav bar visibility" into sc-qpr1-dev am: efe1d4bffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935202

Change-Id: Ic4ae034f549fefd094ce9ff1a36f7b28f0572428
 2021-09-29 05:09:05 +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
Winson Chung
efe1d4bffe Merge "Don't factor animating-to-sleep for nav bar visibility" into sc-qpr1-dev 2021-09-29 04:59:36 +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
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
Daniel Solomon
448dd444ad Separate refresh rate restrictions for different High Brightness Modes 
Allow setting a different refresh rate for High Brightness Mode for HDR
and for Sunlight.

Bug: 196691596
Test: atest DisplayModeDirectorTest
Test: Manual:
      1. Ensure HBM for HDR takes presedence over HBM for Sunlight
      2. Ensure app refresh rate votes override bothHBM for Sunlight
Change-Id: I4a29c47f218046d0852178ad5dc7484a86ef8607
 2021-09-29 03:55:26 +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
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
c410f29893 Merge "Zero out WiFi duration and power if ControllerActivityCounter is null" into sc-qpr1-dev 2021-09-29 00:30:02 +00:00
Bill Yi
117d225ce6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40011337f0d111652e58901c939247da2f305ced
 2021-09-29 00:29:16 +00:00
Bill Yi
d92e0b1329 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb4a34ec9bfbe8f33fcffce5f883dec8dccbbf13
 2021-09-28 23:51:34 +00:00
Bill Yi
7351941662 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1a2f10d53e3c22d90495c255dbae71dc25deca76
 2021-09-28 23:50:23 +00:00
Bill Yi
2f8fd51b76 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1db9e1ee4f24934d64fea4b66a0cc102d70254d8
 2021-09-28 23:50:11 +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
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
8dc8182ad0 Merge "ViewRootImpl: Update opaque flag if SurfaceControl changes from relayout" into sc-qpr1-dev 2021-09-28 20:38:42 +00:00
Bill Yi
df0cafc96f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c752f3971c33329300390aca506199c5a1673e1
 2021-09-28 20:29:52 +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
Xin Li
8891d70334 Merge SP1A.210812.016 
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
 2021-09-28 19:26:36 +00:00
Winson Chung
af95ce5be9 Don't factor animating-to-sleep for nav bar visibility 
- Instead, just animate the current nav bar view (which doesn't cause
  insets changes).  This should be safe to do because:
  1) Nothing else animates the alpha of this particular part of the
     view hierarchy
  2) Confirmed with SysUI folks that we always get onStartedWakingUp
     after onStartedGoingToSleep
  3) This otherwise reverts to the same nav bar visibility logic in R

Bug: 196789451
Bug: 190368572
Test: atest StatusBarKeyguardViewManagerTest
Test: In three button nav w/ AOD, turn off the screen
      - also try above with interrupting the screen off animation
      - also try above with power button instantly locks disabled
Change-Id: I1be44a9a8dbb8cea17bbf354a2e03dd4bad5a4a2
 2021-09-28 11:45:46 -07: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
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
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
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