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
Shawn Lin
2c9791ffc3 Merge "Fix incorrect talkback text for non-sfps devices" into udc-dev 2023-05-05 03:30:04 +00:00
Austin Borger
52de91e779 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: efcfb1e068 -s ours am: 402d56a97f -s ours am: e292c2a197 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I4d2f715a3a3949b5715fdfc87a8cb6b7aaf7fcc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:22:49 +00:00
Austin Borger
d4c5e11bdf [automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 am: 59882f5e70 am: cc0438c716 -s ours am: 93b82d9119 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I0d30760fddb2075fd442ae2b41bc7e02c25885a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:22:39 +00:00
Chaohui Wang
f7d5357808 Merge "Protected context of AppOpPermissionListModel" into udc-dev am: 4eada6b5ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22984665

Change-Id: I0ce55e87cc08016653e89b4ad438f4d9213836e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:18:05 +00:00
Treehugger Robot
b39dfd5361 Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev am: af7b1229c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22871655

Change-Id: Iabe826d20a44ea533661013e11990b55ed16d651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:17:40 +00:00
Austin Borger
e292c2a197 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: efcfb1e068 -s ours am: 402d56a97f -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I23cd0053a3d3dad8328e4099880f594bee944548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:15:59 +00:00
Austin Borger
93b82d9119 [automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 am: 59882f5e70 am: cc0438c716 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: Ic241a6a32809946888dc6d46aad1b67ccf51651a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 03:13:41 +00:00
Chaohui Wang
4eada6b5ca Merge "Protected context of AppOpPermissionListModel" into udc-dev 2023-05-05 03:03:53 +00:00
Treehugger Robot
af7b1229c2 Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev 2023-05-05 03:02:47 +00:00
Daniel Huang
bc12833512 Merge "Set TOUCHPAD_NATURAL_SCROLLING default value to 1" into udc-dev am: c83bad2695 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23020016

Change-Id: I369175b91c44ffb12ca8d16842226bd395eb676b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:34:58 +00:00
Treehugger Robot
5068f795e7 Merge "Update the java doc for PackageInfo#versionName" into udc-dev am: 2f4a06c673 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22986801

Change-Id: Id2fe1b3a31d1087b05f10b54193f6306019281c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:34:16 +00:00
Daniel Huang
c83bad2695 Merge "Set TOUCHPAD_NATURAL_SCROLLING default value to 1" into udc-dev 2023-05-05 02:34:03 +00:00
Helen Qin
316c3e1e2d Merge "Remove unwanted separator bar when description is empty" into udc-dev am: 4d79564522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047053

Change-Id: I01bf6b7f3c22308c2b6a6d5886f25fd5171a70c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:33:23 +00:00
Treehugger Robot
2f4a06c673 Merge "Update the java doc for PackageInfo#versionName" into udc-dev 2023-05-05 02:33:04 +00:00
Treehugger Robot
f5d7f29332 Merge "Fix the null toString logic." into udc-dev am: 217d64daaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048862

Change-Id: Idf502f28fbf8af47a9e385b2bd1dbf721e509585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:32:51 +00:00
Ivan Chiang
0917e6a368 Update the java doc for PackageInfo#versionName 
Bug: 196792466
Test: atest PackageInfoTest
Change-Id: I9f7ab41fe4b734b5245247e0ce74ea3096617630
 2023-05-05 02:32:16 +00:00
Hongguang Chen
d796b960a1 Merge "[TIAF] Fix FD leak in AdBuffer" into udc-dev am: c246ee42f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048836

Change-Id: I9c3f10b7d730976112bd66e0df097f1dc0c4b991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:32:11 +00:00
Austin Borger
b36f5516d7 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: a4b42b8624 -s ours am: 5949a0414c -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I87a1b7c9a59e6f20813147101e625c512d51375a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:31:49 +00:00
Helen Qin
4d79564522 Merge "Remove unwanted separator bar when description is empty" into udc-dev 2023-05-05 02:27:19 +00:00
Treehugger Robot
217d64daaa Merge "Fix the null toString logic." into udc-dev 2023-05-05 02:26:39 +00:00
Austin Borger
402d56a97f [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: efcfb1e068 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I78f21bafd0527089bd27de1c6f925e5f364e5fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:16:33 +00:00
Austin Borger
cc0438c716 Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 am: 59882f5e70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959

Change-Id: If61b1101444493b7a6ffda23ae3d75be9341d758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:16:21 +00:00
Hongguang Chen
c246ee42f1 Merge "[TIAF] Fix FD leak in AdBuffer" into udc-dev 2023-05-05 02:15:14 +00:00
Austin Borger
5949a0414c [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: a4b42b8624 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I2acaba57aa22bdf4d1244b80f07cb5117f34c64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:14:05 +00:00
Austin Borger
8309596aea [automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 am: 35dd64a96e -s ours am: 391b9810c8 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 d0ba7467c2 is already in history

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

Change-Id: I409304ba1c2969d7e6f7c7d434bde13554d662ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:11:27 +00:00
Treehugger Robot
8da2f726aa Merge "Minor refactor to make HACK easier to apply." into udc-dev am: e1b9de8049 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23050006

Change-Id: I70c9beba800d13df9c964257094375dfcf13e966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:11:15 +00:00
Treehugger Robot
8ff22e5ff6 Merge "Make sure to reset isFoldHandled" into tm-qpr-dev am: 921756c9ef am: 1f8b899e1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860951

Change-Id: I1406b6e87018125141497fa443680872fca86e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:11:02 +00:00
Jing Ji
05a6e7e11e Merge "Fix the race condition between creating and killing process group" into udc-dev am: c601737f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22970327

Change-Id: I797b7ea28367c939657347fe82b0b761b5e15e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:10:35 +00:00
Austin Borger
391b9810c8 [automerger skipped] Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 am: 35dd64a96e -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 d0ba7467c2 is already in history

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

Change-Id: I87c7810301bcb63ce44fb6e6cc5918b9fe259683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 02:10:01 +00:00
Yanli Wan
b0f4b97cd6 Allow Device Lock APEX to use the SettingsLib 
Bug: 279616148
Test: build
Change-Id: Ib52a022e7d9b1ec4f7c7eebd2e529f64885e4ddd
 2023-05-05 02:02:04 +00:00
Treehugger Robot
e1b9de8049 Merge "Minor refactor to make HACK easier to apply." into udc-dev 2023-05-05 01:55:56 +00:00
Treehugger Robot
1f8b899e1e Merge "Make sure to reset isFoldHandled" into tm-qpr-dev am: 921756c9ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860951

Change-Id: I785c67b112fa3b04e6b7354a6c396332612759d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 01:47:45 +00:00
Jing Ji
c601737f60 Merge "Fix the race condition between creating and killing process group" into udc-dev 2023-05-05 01:39:37 +00:00
Austin Borger
efcfb1e068 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: I5c0ccb13a1e8a558d18128de367f893ed715259e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 01:33:43 +00:00
Austin Borger
59882f5e70 Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959

Change-Id: Id40be4dddab0596a86ad5ad14c35353cfa4555df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 01:33:23 +00:00
Austin Borger
a4b42b8624 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: Iee50655a40d9174ad2329e5b1a48fd4720db5025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 01:32:30 +00:00
Austin Borger
35dd64a96e Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 am: 8f3f0202c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959

Change-Id: Ia62c7f56a95077f54b30255933af844c8216f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 01:29:05 +00:00
Helen Qin
75a4761c8b When the origin is empty but not null, app label should be used 
Bug: 280902737
Test: manual (see bug for screenshot)
Change-Id: I1edc10ba6887f360e4184bf7a93b8ebb78f0e4c5
 2023-05-05 01:25:44 +00:00
Treehugger Robot
921756c9ef Merge "Make sure to reset isFoldHandled" into tm-qpr-dev 2023-05-05 01:05:05 +00:00
Peter Kalauskas
d1586fab32 Fix crash in jank monitor debug overlay 
Fix CalledFromWrongThreadException crash which occurred when
InteractionJankMonitor is used for multiple Views that run on different
threads.

Also, create a new trace track so usage of the debug overlay is more
apparent when viewing a trace. Traces that use the debug overlay should
not be used for performance analysis.

Test: Enable debug overlay, open QS, then tap gear icon to open
      Settings. Make sure system does not crash
Bug: 279472146
Change-Id: I68ba670dfd6c4c055c10ede357b10a37a9e83cb7
 2023-05-05 00:52:28 +00:00
Austin Borger
8486a0b6ae [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: Id0c4f7791b5e51c39dcddfdce76a1c855aa994b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:41:36 +00:00
Austin Borger
8f3f0202c1 Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 am: e070aa49d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959

Change-Id: I3a39e9a73d47e01617297243e7b107c91db4999a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:41:06 +00:00
Suprabh Shukla
82c39c6e11 Log mode changes to OP_RUN_ANY_IN_BACKGROUND 
This app-op puts the app into background restriction and should only be
done via user-consent. Adding a temporary log to collect data about its
modifications.

Test: Manually put any app into "Restricted" mode under battery settings
and observe the logs.
Test: switch appops using the command `appops set` and observe the
logs.

Bug: 280192659
Change-Id: I0a84541f39bd1528f2b2af0a57d3d44f969a2eed
 2023-05-04 17:25:50 -07:00
Helen Qin
d2786a80ca Fix the null toString logic. 
Test: manual (see bug for screenshot)
Bug: 280896321
Change-Id: Ied05c43a09d6a2086dc60d7c9d5cb1d35a8bba91
 2023-05-05 00:21:30 +00:00
Nick Deakin
792ebab631 SilkFX: fix gainmap metadata editor size 
Make the gainmap metadata editor more robust against different display
sizes and settings by changing the main layout to "wrap_content" instead
of using a fixed size.

This ensures that things should still work reasonably well even if your
display setup is significantly different from what I tested with (eg.
smaller display size, or larger font size). In particular, it should
help avoid the buttons at the bottom of the editor being cutoff and
making it so that you can't dismiss the editor.

Note that one could still run into issues with extreme situations (eg.
if the display is very very small or the font size is very very very
large), but this should take care of 98% of the edge cases that
previously would be problematic.

Bug: 280889052
Test: verified display with Font Size increased
Change-Id: I4612625ac29d6227c2852b50902098aad43f3d22
 2023-05-04 20:19:03 -04:00
Treehugger Robot
bc93f7cbe6 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-05 00:14:07 +00:00
Austin Borger
4f13d0716c [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: Icb87930e8e1810cc21f2bcc67b1271e702a56d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:03:49 +00:00
Austin Borger
e070aa49d8 Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959

Change-Id: I97c8f7a192e7c6bf75426e459c1eb40c7773370b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:03:36 +00:00
Austin Borger
2324f3a7a1 [automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours 
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history

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

Change-Id: Icc7d8d1f992ff95e1b9476906f06254a45602801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:00:12 +00:00
Atneya Nair
62c5f55e1b Merge changes from topic "st_stopping" into udc-dev am: 9e6c6ca843 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787401

Change-Id: Icacb07bce0baebde1a9a58380024a348ac6a1d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:46:07 +00:00