Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,821 Commits 3 Branches 0 Tags
c2a2aa12d600f17e77335c8df8dfa4b31e668301
Commit Graph

640821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
c2a2aa12d6 Merge "Update the conversation priority flow" into sc-dev am: 2d880ae90a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14282287

Change-Id: I8109cd4894a7ce2bab1860d4ea2a1c7fc0742dac
 2021-05-04 15:46:21 +00:00
Fabian Kozynski
c079cb8633 Merge "Fix pageMargin in PagedTileLayout" into sc-dev am: 95c0278060 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14388351

Change-Id: I8803a26c14a8245c9db1edf25f2b968b0ea81c3c
 2021-05-04 15:44:28 +00:00
Julia Reynolds
2d880ae90a Merge "Update the conversation priority flow" into sc-dev 2021-05-04 15:41:59 +00:00
Fabian Kozynski
95c0278060 Merge "Fix pageMargin in PagedTileLayout" into sc-dev 2021-05-04 15:38:59 +00:00
Eric Laurent
48d1820089 Merge "AudioAttributes: remove JNI warning" into sc-dev am: 60a8a4c02c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14424460

Change-Id: I613368be0636d10d1e2f0130860b3ed40450d921
 2021-05-04 15:36:29 +00:00
Minche Li
2fca8b417c Merge "Uses windowContext for the MagnificationGestureHandler" into sc-dev am: 50ba1e1eb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408116

Change-Id: I800793307dfd66c6023075f5c44d310ed7468251
 2021-05-04 15:36:17 +00:00
Anna Zappone
36190602fb Merge "Handle work profile, DND state, app pauses" into sc-dev am: 8315904e81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353364

Change-Id: I0c15e7a1eddad6072fde84506a904a3acdcbc646
 2021-05-04 15:35:56 +00:00
Eric Laurent
60a8a4c02c Merge "AudioAttributes: remove JNI warning" into sc-dev 2021-05-04 15:33:08 +00:00
Minche Li
50ba1e1eb5 Merge "Uses windowContext for the MagnificationGestureHandler" into sc-dev 2021-05-04 15:29:38 +00:00
Anna Zappone
8315904e81 Merge "Handle work profile, DND state, app pauses" into sc-dev 2021-05-04 15:16:52 +00:00
Michał Brzeziński
5bd8f66916 Merge "Fixing notification scrim bounds in split shade" into sc-dev am: 0be45a9f5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14353372

Change-Id: I9d43b681b32f9ac5cd128c7262fc72c7d41886aa
 2021-05-04 14:49:53 +00:00
Michał Brzeziński
55f111e2b2 Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev am: f251391e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14199837

Change-Id: Ic918be32c82845c09c04f0e7897ff239eb74b975
 2021-05-04 14:49:43 +00:00
Nikita Iashchenko
84f0f0f972 Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 am: 2368ec9e27 am: 4052d42e8c am: 40f1d1a2c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690841

Change-Id: Icb2fa938a3c1e5f92465a49cbbbe4fda0d527c62
 2021-05-04 14:49:30 +00:00
Michał Brzeziński
0be45a9f5b Merge "Fixing notification scrim bounds in split shade" into sc-dev 2021-05-04 14:43:41 +00:00
Michał Brzeziński
f251391e69 Merge "Fixing QS expanding in split shade when swipe happens on notifications" into sc-dev 2021-05-04 14:40:18 +00:00
Nikita Iashchenko
40f1d1a2c5 Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 am: 2368ec9e27 am: 4052d42e8c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690841

Change-Id: Ibde2ce8cc39a2b3f564a2c11a85e18a24cce0595
 2021-05-04 14:33:17 +00:00
Yuri Lin
3f1fb8f233 Merge "Add a lock around mBuffer in Archive." into sc-dev am: e9e836dffb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14412686

Change-Id: Ib7554be46dc4cdb6381c0924df504c289a689731
 2021-05-04 14:18:26 +00:00
Nikita Iashchenko
4052d42e8c Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 am: 2368ec9e27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690841

Change-Id: Iffdf2d1a95c7fa7f751790d0ca24ef1f662c178d
 2021-05-04 14:16:36 +00:00
Yuri Lin
e9e836dffb Merge "Add a lock around mBuffer in Archive." into sc-dev 2021-05-04 14:13:23 +00:00
Jeff DeCew
a03169570d Merge "Fix logic for logging bitmap errors" into sc-dev am: b8eac19403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14412917

Change-Id: I17c6dbd5f9dd6c59142857c105300338bea3105c
 2021-05-04 13:53:05 +00:00
Jeff DeCew
b8eac19403 Merge "Fix logic for logging bitmap errors" into sc-dev 2021-05-04 13:46:51 +00:00
Anton Hansson
44f22bd54d [automerger skipped] Make framework-all depend on modules-utils-build am: 9fb1845e5a -s ours am: 2e44480716 -s ours 
am skip reason: Merged-In I1cea62aaedb7e653648130e3d315761c0c9aece4 with SHA-1 486eb760ac is already in history

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

Change-Id: Id6676293c17a739b6945075abede6067e45eaa21
 2021-05-04 13:46:13 +00:00
Joanne Chung
97f4293f4d Merge "Fix UiTranslationStateCallback crash due to null locales." into sc-dev am: 2c6a3b5cd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419522

Change-Id: Ib46dd5b6bf58e15ade2a1382507dafcb208cb8ba
 2021-05-04 13:45:52 +00:00
Nikita Iashchenko
2368ec9e27 Merge "Rename MimeMap.Builder setter methods to match guidelines" am: 9ef9fab0a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690841

Change-Id: I63505bcfa89775cb117b4063c48029b8ae886889
 2021-05-04 13:38:21 +00:00
Anton Hansson
2e44480716 [automerger skipped] Make framework-all depend on modules-utils-build am: 9fb1845e5a -s ours 
am skip reason: Merged-In I1cea62aaedb7e653648130e3d315761c0c9aece4 with SHA-1 486eb760ac is already in history

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

Change-Id: I6e9469523fa2ca4606be7cf6d5e9db6eac246eb9
 2021-05-04 13:29:34 +00:00
Joanne Chung
2c6a3b5cd0 Merge "Fix UiTranslationStateCallback crash due to null locales." into sc-dev 2021-05-04 13:26:01 +00:00
Nikita Iashchenko
9ef9fab0a1 Merge "Rename MimeMap.Builder setter methods to match guidelines" 2021-05-04 13:20:15 +00:00
Henry Fang
029835a4fe Merge "Make ACCESS_TUNER_RESOURCES a vendor privileged permission" into sc-dev am: 0f314d689f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14345797

Change-Id: Ie63906d1979d978ed28cfc19637bfbeaccddca97
 2021-05-04 13:15:46 +00:00
Henry Fang
0f314d689f Merge "Make ACCESS_TUNER_RESOURCES a vendor privileged permission" into sc-dev 2021-05-04 13:02:15 +00:00
Riddle Hsu
7f4fdd89b2 Merge "Apply rotation animation when canceling fixed rotation" into sc-dev am: 25a8b5f625 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14352468

Change-Id: I11db51d9a053249db851bea536e560b4ed72b7da
 2021-05-04 12:11:42 +00:00
Riddle Hsu
25a8b5f625 Merge "Apply rotation animation when canceling fixed rotation" into sc-dev 2021-05-04 11:53:30 +00:00
Anton Hansson
9fb1845e5a Make framework-all depend on modules-utils-build 
This patch is only necessary in R-based branches, as the bad build rule
setup has been resolved at HEAD.

Since sdkextensions is adding a dependency on modules-utils-build, add
that dependency to framework-all as well as it uses the sdkextensions
sources to compile.

Bug: 185567297
Test: m framework-all
Merged-In: I1cea62aaedb7e653648130e3d315761c0c9aece4
Change-Id: Id4e547322716220c7ea7b20b0b20c06747f29330
 2021-05-04 12:28:34 +01:00
Stanislav Zholnin
959e1d3889 Merge "Add more explanation on difference between aggregate and discrete information." into sc-dev am: 3476ed1d68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411200

Change-Id: Ide7cee1d683ae5116ec0b3d91279ea1bbb9369d0
 2021-05-04 11:27:18 +00:00
Stanislav Zholnin
3476ed1d68 Merge "Add more explanation on difference between aggregate and discrete information." into sc-dev 2021-05-04 11:23:40 +00:00
Eric Laurent
c0b723951f AudioAttributes: remove JNI warning 
Do not register an empty native methods array in
android_media_AudioAttributes.cpp.

Bug: 187156182
Test: make and boot
Change-Id: Ida81eeef1f470336a00fea6c26fd7823311da980
 2021-05-04 11:21:40 +00:00
Jorim Jaggi
25ae47fd4e Merge "Mark first frames in metrics properly" into sc-dev am: a4d6988f12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411196

Change-Id: If9e832f45b8d5eac26fc11eb544922fc2d05d61e
 2021-05-04 11:18:28 +00:00
Jorim Jaggi
a4d6988f12 Merge "Mark first frames in metrics properly" into sc-dev 2021-05-04 10:55:59 +00:00
Alex Johnston
4c60a03778 Merge "DPM Check for unaffiliated secondary users" into sc-dev am: 345ff0cc74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325409

Change-Id: I344f07a727a3697d3fee9f8fcd8f1f626f5f4de3
 2021-05-04 10:30:02 +00:00
Bill Lin
2c8a242c4e Merge "OneHandedUiEventLoggerTest sometimes flaky" into sc-dev am: 02f635462b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408816

Change-Id: I20b461b71a79e8a815d9baf29ffae508594b5a76
 2021-05-04 10:29:56 +00:00
Edward Cunningham
1c3ad7c6ca Merge "Delete staged APK whenever DeleteStagedFileOnResult finishes." into sc-dev am: afe3d75e1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14234555

Change-Id: If8e32018faa1ea60889843e933bdd03c4cbb2cff
 2021-05-04 10:29:44 +00:00
Alex Johnston
345ff0cc74 Merge "DPM Check for unaffiliated secondary users" into sc-dev 2021-05-04 10:23:39 +00:00
Bill Lin
02f635462b Merge "OneHandedUiEventLoggerTest sometimes flaky" into sc-dev 2021-05-04 10:12:06 +00:00
Edward Cunningham
afe3d75e1c Merge "Delete staged APK whenever DeleteStagedFileOnResult finishes." into sc-dev 2021-05-04 10:07:40 +00:00
mincheli
1b2cf756a7 Uses windowContext for the MagnificationGestureHandler 
ContextImpl checks the incorrect Context usage in S.
If non-ui context access window service, it would throw an
IllegalAccessException.
And the bug happened because the GestureDectectors in
PanningScalingHandler.class don't have the correct context.
So we have to apply using uiContext for the GestureDectectors
and MagnificationGestureHandler.

Bug: 185154435
Test: none
Change-Id: I942192011526d0e4ce68e6121855bd321c499f56
 2021-05-04 17:10:22 +08:00
Bill Lin
7cb819b5db Merge "Refine dump info of One Handed Mode components" into sc-dev am: 77f40a59bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408817

Change-Id: Ie6d69ed12c8f8166a1f9dbb792532e414a37d946
 2021-05-04 08:43:55 +00:00
Bill Lin
77f40a59bf Merge "Refine dump info of One Handed Mode components" into sc-dev 2021-05-04 08:37:59 +00:00
Wu Ahan
047dfe766e Merge "Refine the latency and jank instrumentation of opening panel" into sc-dev am: bc299eb47a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340444

Change-Id: I26e59246930fcd3019e4f72f80d276d1a2de7e9f
 2021-05-04 08:36:23 +00:00
Wu Ahan
bc299eb47a Merge "Refine the latency and jank instrumentation of opening panel" into sc-dev 2021-05-04 08:14:43 +00:00
Riddle Hsu
4acef76393 Merge "Avoid intermediate orientation change" into sc-dev am: eee1089cb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408958

Change-Id: I0d7d198ad28910b81febedbf48c93be81bd6e709
 2021-05-04 06:50:17 +00:00
Riddle Hsu
eee1089cb5 Merge "Avoid intermediate orientation change" into sc-dev 2021-05-04 06:26:11 +00:00