Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
891,995 Commits 3 Branches 0 Tags
00a7e67eaf142bdc65e30b981c2fd3ef3abfb0ce
Commit Graph

891995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Jedral
c0553faff4 Merge "Report correct userId in onUserMayRequestUnlock." into udc-dev 2023-05-05 20:18:46 +00:00
Treehugger Robot
50cae984df [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 am: f159ca1389 -s ours am: c2d4c99955 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac4b8e1131eb0932f827d65665a03c446d3b3051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 20:16:54 +00:00
Sumedh Sen
f3abbe10c2 [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 am: 845460ecd7 -s ours am: f5447b2676 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If236705fadd53de5eeee681cdd1af7016fbe4b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 20:16:36 +00:00
Nick Deakin
e350e113e6 Merge "SilkFX: fix gainmap metadata editor size" into udc-dev am: d33c5e3df8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048059

Change-Id: Ic61cbfce320b2dfe922fb032df244b33d0e9b9dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:58:58 +00:00
Liran Binyamin
3caf8763ad Merge "Update the color of the bubble expanded view pointer arrow to match the background color of the overflow expanded view." into udc-dev am: 41f14bf4df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23057035

Change-Id: Ic98d0471985c0d19d17724e819e1047d49439560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:58:23 +00:00
Matt Pietal
93d0befff1 Merge "Capture all remote exceptions" into udc-dev am: 16161f646b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23059648

Change-Id: I23f4b89f2478348e9026856cefa52d82bad77fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:57:12 +00:00
Nick Deakin
d33c5e3df8 Merge "SilkFX: fix gainmap metadata editor size" into udc-dev 2023-05-05 19:52:36 +00:00
Liran Binyamin
41f14bf4df Merge "Update the color of the bubble expanded view pointer arrow to match the background color of the overflow expanded view." into udc-dev 2023-05-05 19:49:52 +00:00
Matt Pietal
16161f646b Merge "Capture all remote exceptions" into udc-dev 2023-05-05 19:42:43 +00:00
Will Leshner
a2dcfd4c25 Fix a transition issue when entering a dream. 
When entering a dream, the transition should be for the visible activity
to remain in place while the dream fades in. A bug was causing the
current activity to slide out before the dream faded in.

Test: Manually by launching setting up the device to show a screen
saver, launching an activity (such as Play Store), and then waiting for
the device to show the screen saver. The previous activity should remain
in place as screen saver fades in.
Bug: 279487452

Change-Id: Idccd30cdf26fca9826a80d9705f17217d92034a7
 2023-05-05 12:37:38 -07:00
Treehugger Robot
5c1e062aa9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 am: fd4eda9070 -s ours am: f5077b0b3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icaa9960b6cc34fd194356b47ca0e553040fa1ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:37:33 +00:00
Sumedh Sen
036411a447 [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 am: 59f8eb5ba9 -s ours am: fa0c632b22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a5a069401a98f2122834c91adafe2007475fd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:37:29 +00:00
Ats Jenk
53df4e9ff0 Merge "Create a Kotlin class for using protolog in wmshell" into udc-dev am: 58f9a5993c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23043736

Change-Id: I09782f457d988f4718156d8226023810895b9312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:37:15 +00:00
Treehugger Robot
c2d4c99955 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 am: f159ca1389 -s ours 
am skip reason: Merged-In I169a1f72c84528ca606b6a4da165d4fbcd02b08d with SHA-1 b988a09db5 is already in history

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

Change-Id: I0c6974bc232a46c52b45bf5c98a0058fa94ddb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:37:08 +00:00
Sumedh Sen
f5447b2676 [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 am: 845460ecd7 -s ours 
am skip reason: Merged-In I169a1f72c84528ca606b6a4da165d4fbcd02b08d with SHA-1 b988a09db5 is already in history

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

Change-Id: Iec2bc7a3d3093428aeb6f7e646151c2b97389c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:36:59 +00:00
Yanli Wan
f6934f1400 Merge "Allow Device Lock APEX to use the SettingsLib" into udc-dev am: faf24da997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047962

Change-Id: I7c6420cf6014ec646bfd9652c3ee41ce0a89d553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:36:50 +00:00
Suprabh Shukla
35f6cc23fa Merge "Log mode changes to OP_RUN_ANY_IN_BACKGROUND" into udc-dev am: c998dec927 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23045016

Change-Id: Id7e05e70eab10ec0b66ec4917935fd311a43e153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:35:19 +00:00
Treehugger Robot
f5077b0b3c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 am: fd4eda9070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ef70be1d6ec51a6b0fa6396ae338b96ad1d64fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:34:01 +00:00
Sumedh Sen
fa0c632b22 [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 am: 59f8eb5ba9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac88c175cb9199080a6c3e8f0148c98ee45b8a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:33:27 +00:00
Ats Jenk
58f9a5993c Merge "Create a Kotlin class for using protolog in wmshell" into udc-dev 2023-05-05 19:31:34 +00:00
Yanli Wan
faf24da997 Merge "Allow Device Lock APEX to use the SettingsLib" into udc-dev 2023-05-05 19:21:22 +00:00
Suprabh Shukla
c998dec927 Merge "Log mode changes to OP_RUN_ANY_IN_BACKGROUND" into udc-dev 2023-05-05 19:15:26 +00:00
Reema Bajwa
12ec3dc175 Merge "Reduce timeout to 3 seconds for provider response" into udc-dev am: 9d69f5af55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23049440

Change-Id: I688a351ac8f692b57b45fac90d8741273385afd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:14:00 +00:00
Kevin Jeon
99d461b97c Merge "Add null check to SQLiteConnectionPool.dump()" into udc-dev am: ab8be59c13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23057623

Change-Id: I6e4ff9e325e5b05d3f3b6d2f6de5ec2466da8073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:13:35 +00:00
TreeHugger Robot
11668d837b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-qpr-dev am: 22e6d70445 -s ours am: 7165756cc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20cf134bd962ff521ea85f1fc746131bd5373f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:12:02 +00:00
Sumedh Sen
e78a3691ee [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: b988a09db5 -s ours am: 279d8489ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02c39e64a138d5d722da58472de6dadcfdd6cb88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:11:59 +00:00
Pranav Madapurmath
b3742d0923 Merge "Support notion of ECBM for work profiles." into udc-dev am: 3d414dd338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22934876

Change-Id: Id2c071cad12a27a86392cd4d8e05dae349ed31f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 19:11:47 +00:00
Reema Bajwa
9d69f5af55 Merge "Reduce timeout to 3 seconds for provider response" into udc-dev 2023-05-05 18:55:07 +00:00
Treehugger Robot
f159ca1389 Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509574

Change-Id: I1b64fec82ddb9f8780b8536dec2dbebde6b8735c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:54:52 +00:00
Sumedh Sen
845460ecd7 [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509574

Change-Id: I1cda26f6bab7ffc114f9e57809ff0f2208e302b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:54:48 +00:00
Treehugger Robot
fd4eda9070 Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev am: 844fdfc824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509574

Change-Id: I5a01cecdc7d9b769ea89b18d4b752686616b4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:54:24 +00:00
Sumedh Sen
59f8eb5ba9 [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: 28e133dff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22509574

Change-Id: I0b10856f8b6be2458f656aad966983c8b6b52eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:54:20 +00:00
Kevin Jeon
ab8be59c13 Merge "Add null check to SQLiteConnectionPool.dump()" into udc-dev 2023-05-05 18:53:28 +00:00
TreeHugger Robot
7165756cc4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-qpr-dev am: 22e6d70445 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfadb256f788280dfd9f36003129406de3e618a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:50:53 +00:00
Sumedh Sen
279d8489ec [automerger skipped] [RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB am: b988a09db5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20edbc1fb16b1e5df68a993ddb283fabe67d69d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:50:24 +00:00
Pranav Madapurmath
3d414dd338 Merge "Support notion of ECBM for work profiles." into udc-dev 2023-05-05 18:48:40 +00:00
Kenneth Ford
081d655ec3 Adds getRearDisplayMetrics method 
Allows the metrics for the rear display to be accessed
synchronously to provide in the jetpack client library

Bug: 273813115
Test: ExtensionRearDisplayTest#testGetRearDisplayMetrics
Change-Id: Ic07f080a39db8f9332c9b4ba79c5529884e4f851
 2023-05-05 18:42:30 +00:00
Becca Hughes
34761fc76c Fix can't turn off Google 
When updating settings it was reading stale
data from the service so this updates it
to get the provider list straight from
the source.

Test: ondevice
Bug: 280908763
Change-Id: I2bd4f8dc4d92041569040c3412189412a4c5db30
 2023-05-05 18:34:07 +00:00
Jeff DeCew
2b985e407e Merge "Update the Aod Icon colors after the HUN->AOD transition" into udc-dev am: c1358b3c99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051397

Change-Id: I375f816256c532fff91572dabd672b9c9dcdd1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:31:08 +00:00
Dmitri Plotnikov
f7b2e3d0e0 Merge "Improve logic around battery history time base" into udc-dev am: 17fb2d86e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23036991

Change-Id: I57b3f83670de1c6469637fb6900b01d294787711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:30:19 +00:00
Jean-Michel Trivi
754e8227df Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev am: 72d3082e8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23059295

Change-Id: I111d17647bfe674b148936fdf7a110fd8d741585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:29:28 +00:00
Jeff DeCew
c1358b3c99 Merge "Update the Aod Icon colors after the HUN->AOD transition" into udc-dev 2023-05-05 18:17:09 +00:00
Dmitri Plotnikov
17fb2d86e5 Merge "Improve logic around battery history time base" into udc-dev 2023-05-05 18:14:32 +00:00
Jean-Michel Trivi
72d3082e8a Merge "AudioService: fix removeDeviceAsNonDefaultForStrategy regression" into udc-dev 2023-05-05 18:12:55 +00:00
TreeHugger Robot
22e6d70445 Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-qpr-dev 2023-05-05 18:11:16 +00:00
Treehugger Robot
844fdfc824 Merge "[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work profile using ADB" into tm-dev 2023-05-05 18:10:56 +00:00
Jeff DeCew
1e15d8650e Remove ShadeViewRefactor annotation and uses 
NOTE: I removed the class and the usages were removed by the IDE.

Fixes: 281080274
Test: atest SystemUiTests
Change-Id: Ibcdf29154ebaa6c02cf5a7456efe1c4acd67bea0
 2023-05-05 14:10:32 -04:00
Treehugger Robot
412d9d9fae Merge "Fix AudioProductStrategy.equals implementation" into udc-dev am: c4f7591217 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051408

Change-Id: Ia3dddf0985bb3bfaac6331cf01306436a60161bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:09:39 +00:00
Mark Renouf
379291d23c Merge "Skip shared element transition for implicit intent" into udc-dev am: 05a834b1d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23036065

Change-Id: I35d74b50f0ad1f819aa13839d18d0354704e7054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 18:09:18 +00:00
Treehugger Robot
c4f7591217 Merge "Fix AudioProductStrategy.equals implementation" into udc-dev 2023-05-05 18:08:02 +00:00