Michael Ludwig
f19b1dfd60
Merge "Emulate replace clip ops using SkAndroidFrameworkUtils::ResetClip"
2021-08-03 19:52:16 +00:00
Shuo Qian
bb078eb66f
Merge "Check callingpackage for calling UID consistency with phoneAccountHandle."
2021-08-03 19:43:31 +00:00
Automerger Merge Worker
e2dcc13f00
Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: f69b24a588" into sc-v2-dev-plus-aosp am: 281094c6e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: Ib5cc2f6e335dd3e479780f1bb9181f528a0ed337
2021-08-03 19:06:06 +00:00
Automerger Merge Worker
63d4ebc5cd
Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: de3244d3f0" into sc-v2-dev-plus-aosp am: 30064aea85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: Icc03301fba93bdf6f59baf29d31e32770c59a55c
2021-08-03 19:05:46 +00:00
TreeHugger Robot
444a239b48
Merge "Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""" into sc-v2-dev am: ed4d4329ea am: 3d3a695785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15432522
Change-Id: I6d53e3ecaa0253c65b3e81b1fdcac43c5b3942d6
2021-08-03 19:05:22 +00:00
Automerger Merge Worker
281094c6e3
Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: f69b24a588" into sc-v2-dev-plus-aosp
2021-08-03 18:50:11 +00:00
Kevin Chyn
24eb7ba9dd
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: f69b24a588
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I5658e5a135cc178ee0e2efb62d08e2da8a39021f
2021-08-03 18:50:05 +00:00
Automerger Merge Worker
30064aea85
Merge "Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: de3244d3f0" into sc-v2-dev-plus-aosp
2021-08-03 18:50:04 +00:00
Kevin Chyn
a2f9c0b2be
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: de3244d3f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I071b8b5bd863ec4b3d6e7a8b562cd094167adce8
2021-08-03 18:50:00 +00:00
TreeHugger Robot
3d3a695785
Merge "Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""" into sc-v2-dev am: ed4d4329ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15432522
Change-Id: I9acaa75f44f3ce48446b7bc135ad0c3062a625c7
2021-08-03 18:49:45 +00:00
Kevin Chyn
8249e1358f
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b am: 7886ee4138
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I0a91c06b94716f5a937c52a9109d09a5742bf5ef
2021-08-03 18:49:15 +00:00
Kevin Chyn
f69b24a588
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I3ac9db0763ec34ab2d9100cdc565d636861a7f75
2021-08-03 18:38:38 +00:00
TreeHugger Robot
ed4d4329ea
Merge "Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""" into sc-v2-dev
2021-08-03 18:38:30 +00:00
Kevin Chyn
7886ee4138
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I168c5b437e4f6c14848be0747d5ec0a2c2dd8e0d
2021-08-03 18:37:39 +00:00
Winson Chung
0a5e07d0c7
Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev am: fa8944c1a2 am: 39326cd053
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15443607
Change-Id: I01a64f21e47c937f2b4128df057f5e66458c9aff
2021-08-03 18:37:24 +00:00
Kevin Chyn
de3244d3f0
Merge "Ensure authentication lifecycle ends for callers" into sc-dev am: a0df5a941b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15434472
Change-Id: I3dea7b6ede7f42911a3c89b4152da829985bfaf7
2021-08-03 18:37:01 +00:00
Kevin Chyn
a0df5a941b
Merge "Ensure authentication lifecycle ends for callers" into sc-dev
2021-08-03 18:28:26 +00:00
Winson Chung
39326cd053
Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev am: fa8944c1a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15443607
Change-Id: Ieff894252cffc4df4cd5110a16ccae614731d174
2021-08-03 18:25:27 +00:00
Winson Chung
fa8944c1a2
Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev
2021-08-03 18:08:42 +00:00
Yohei Yukawa
19e444c7db
Merge "Fix lint warnings in IInputConnectionWrapper"
2021-08-03 18:03:32 +00:00
Felipe Leme
8393d13c30
Merge "Added managed profile owners on 'cmd device_policy list-owners'" into sc-v2-dev am: 92b3263924 am: 6889f31bd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238967
Change-Id: I2d1df2b52e9160fed07b1e9f9b0e546dc8feebb1
2021-08-03 16:55:01 +00:00
Felipe Leme
6889f31bd4
Merge "Added managed profile owners on 'cmd device_policy list-owners'" into sc-v2-dev am: 92b3263924
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238967
Change-Id: I702db5e780dfec4bd17fe1f3d6d89ba5a79a0771
2021-08-03 16:44:31 +00:00
Felipe Leme
92b3263924
Merge "Added managed profile owners on 'cmd device_policy list-owners'" into sc-v2-dev
2021-08-03 16:29:53 +00:00
Bill Yi
e962632a6c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-03 16:20:03 +00:00
Bill Yi
0362c0e15e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-03 16:19:52 +00:00
Lee Shombert
b28f81512e
Merge "Revert "Do not cache wildcard users (PackageManager)""
2021-08-03 16:06:47 +00:00
Nate Myren
9a18ae214c
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: e2942cb666 am: 5ac4c2031a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: Ia42bec41cbe1ecda4e2789f2d4610243f6978744
2021-08-03 16:04:51 +00:00
Nate Myren
371c53e36c
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: f685a342c8 am: dcc8041ac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I9a60df1b6deef04fb880623fb8ea9c3818cc6a49
2021-08-03 16:04:15 +00:00
Nate Myren
5ac4c2031a
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: e2942cb666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I0e1eef0b0fc086ae33b401c8694a9abe352366cd
2021-08-03 15:53:23 +00:00
Nate Myren
f8dd173528
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: 17e6177ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I5081e4f0f78783192f553b74936a15755895e045
2021-08-03 15:52:58 +00:00
Neil Fuller
c2e44a4a83
Merge "Remove simulated LTZP and enable replacement"
2021-08-03 15:51:42 +00:00
Nate Myren
dcc8041ac2
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: f685a342c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I2561613cf775cd7107bba4011a9362c3d9b88cd9
2021-08-03 15:49:39 +00:00
Kweku Adams
ca06c65494
Merge "Initialize the IRS as a SystemService."
2021-08-03 15:46:40 +00:00
Kweku Adams
8eee8e8d86
Merge "Add Doze modifier to JobSchedulerEconomicPolicy."
2021-08-03 15:46:31 +00:00
Michał Brzeziński
d057da2ca5
Revert "Revert "Making mirror slider appear when brightness slider is used in split shade""
...
This reverts commit 7b43d58976 .
Reason for revert: Submitting code with problem fixed
Test: CTS in Forrest
Bug: 193651759
Change-Id: I8dd921ab34798ac156af17a14e2ca27c70a743cc
2021-08-03 16:46:09 +01:00
Michael Ludwig
70cf50c24a
Emulate replace clip ops using SkAndroidFrameworkUtils::ResetClip
...
At the JNI bridge, Region::Op::kReplace_Op is detected and sent
to new functions on Canvas.h -> emulateReplaceClip[Rect|Path].
The SkiaCanvas implementation calls
SkAndroidFrameworkUtils::ResetClip to turn the SkCanvas' clip
wide open (modulo the device clip restriction), followed by
an intersect op with the actual clip geometry.
SkiaCanvas is also updated to record the replace ops in its
Clip struct for partial saves.
This should result in no visible behavioral change at the Java
Canvas level, but allows the removal of the
SK_SUPPORT_DEPRECATED_CLIPOPS flag.
Test: Updated SkiaPipeline.clip_replace unit test to use the new
emulateReplaceClipRect function instead of SkClipOp::kReplace.
Builds and recently added CTS tests for clip ops pass.
Bug: b/151725198
Bug: b/143352151
Change-Id: I8fb8765b4ead92bbe8eceadb52710a5673b6cf6b
2021-08-03 15:46:04 +00:00
Songchun Fan
311da53f21
Merge "[pm] remove false logging"
2021-08-03 15:44:36 +00:00
Nate Myren
e2942cb666
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I63c16fa22d36295b9992740ea95ae69342f22307
2021-08-03 15:34:46 +00:00
Nate Myren
17e6177ea9
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: Ide04bbb96070a0f4ffd9914736278ad1ba1503a5
2021-08-03 15:34:02 +00:00
Nate Myren
f685a342c8
Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15424412
Change-Id: I362a049cc0e3a255796dc3481cbb153c734da76d
2021-08-03 15:33:04 +00:00
Nate Myren
50ff5ac8b8
Merge "Revert sync app op chain changes" into sc-dev
2021-08-03 15:16:35 +00:00
Jeff DeCew
6ab6ee92a7
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 15f319906e am: 804cabbef8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: I57c4515fb5e30cd9da4a3cb107f4c99c7dc14357
2021-08-03 14:01:16 +00:00
Jeff DeCew
8dba695fe0
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 052e6636a5 am: c5d0606509
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: If8fe5ddff37bb08f9050cd1bc3c952c1d3b3cd46
2021-08-03 14:00:58 +00:00
Jeff DeCew
804cabbef8
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 15f319906e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: Ib9641e4c45883f818bc6621ae11460c9ea6bd92a
2021-08-03 13:55:26 +00:00
Jeff DeCew
c5d0606509
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: 052e6636a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: I984d32448382e742c18ea2b231a42525fe68e375
2021-08-03 13:49:32 +00:00
Jeff DeCew
0c17ed911d
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6 am: b24abb8ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: I9da7d16f7ea12f199cff6fae79189a4b68eea44e
2021-08-03 13:48:48 +00:00
Automerger Merge Worker
394fc3acc3
Merge "Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 am: e3bcc4a895" into sc-v2-dev-plus-aosp am: 44cb7f8080
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896
Change-Id: I65a2fd3422c18f0d5db4fd7b72d75605369bcf7e
2021-08-03 13:44:35 +00:00
Joanne Chung
0b64f162bd
Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 am: b6f5b2d050 am: 96a1ed2bb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896
Change-Id: I10430942c233ef229d902bba2cdd153516671289
2021-08-03 13:43:53 +00:00
Jeff DeCew
15f319906e
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: Ic642c0a2a0b6bb3613edee6b4dc49b0e2f061f58
2021-08-03 13:40:25 +00:00
Jeff DeCew
b24abb8ff4
Merge "Fix hidden EmptyShadeView" into sc-dev am: 2458c8f8c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340910
Change-Id: I471c66b754cbabf6f3fec9426f6bcfef6806057f
2021-08-03 13:39:48 +00:00