Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
639,341 Commits 3 Branches 0 Tags
60a8a4c02cd67b2380d421b0e2ac99e542e2adeb
Commit Graph

639341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
b8eac19403 Merge "Fix logic for logging bitmap errors" into sc-dev 2021-05-04 13:46:51 +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
0f314d689f Merge "Make ACCESS_TUNER_RESOURCES a vendor privileged permission" into sc-dev 2021-05-04 13:02:15 +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
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
a4d6988f12 Merge "Mark first frames in metrics properly" into sc-dev 2021-05-04 10:55:59 +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
77f40a59bf Merge "Refine dump info of One Handed Mode components" into sc-dev 2021-05-04 08:37:59 +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
eee1089cb5 Merge "Avoid intermediate orientation change" into sc-dev 2021-05-04 06:26:11 +00:00
Ahaan Ugale
e19085a0cd Fix UiTranslationStateCallback crash due to null locales. 
The locales aren't available on a RESUMED event; now they're stored on a
STARTED event. The crash happens because the default Callback impl
converts the Locale to a string to support a deprecated method.

Fix: 186392998
Test: manual - install test apk which triggers the crash. no crash with
 this change.
Change-Id: Iaceca8d29f4c2b0d692c8f6780b0ab963e4e2243
 2021-05-04 05:35:26 +00:00
SongFerng Wang
19a0cc7574 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev 2021-05-04 05:17:00 +00:00
Songchun Fan
30253adb74 Merge "[IncrementalService] add last read error in dumpsys" into sc-dev 2021-05-04 04:56:04 +00:00
Nader Jawad
d8f57c7cf3 Merge changes from topic "fling_after_pull" into sc-dev 
* changes:
  Allow EdgeEffect to fling during pull
  Remove edge effect type from the API.
 2021-05-04 04:41:04 +00:00
Grace Jia
0f2aea7903 Merge "Provide all active subscriptions when register default app providers." am: 9ef59ac901 am: 825f59adfe am: 1c653b4768 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1694533

Change-Id: Iebde9c030b4e9d4032c03eafd5cad6c169c0993c
 2021-05-04 04:31:20 +00:00
Dmitri Plotnikov
1d211e046e Merge "Use battery capacity estimates provided by Health HAL" into sc-dev 2021-05-04 04:18:36 +00:00
Grace Jia
1c653b4768 Merge "Provide all active subscriptions when register default app providers." am: 9ef59ac901 am: 825f59adfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1694533

Change-Id: I2bf871f8c72c12acca809101665545cb16f205b2
 2021-05-04 04:13:34 +00:00
Louis Chang
3100c1e4f4 Merge "Do not relaunch bg activities when application info changes" into sc-dev 2021-05-04 04:06:48 +00:00
Grace Jia
825f59adfe Merge "Provide all active subscriptions when register default app providers." am: 9ef59ac901 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1694533

Change-Id: I68ab66a3d1ce51e38f980188671a1af0a3f16fc9
 2021-05-04 03:42:10 +00:00
Jieru Shi
9fb45cc8bb Merge "Add impression logging for media recommendation card" into sc-dev 2021-05-04 03:34:55 +00:00
Grace Jia
9ef59ac901 Merge "Provide all active subscriptions when register default app providers." 2021-05-04 03:24:31 +00:00
Dmitri Plotnikov
daa86f4f6a Use battery capacity estimates provided by Health HAL 
Bug: 186807039
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryChargeCalculatorTest
Change-Id: I4eb1606843ca1f2f2c0589e0abe6408f6be149c5
 2021-05-03 18:50:32 -07:00
Dmitri Plotnikov
acc4e1454e Merge "Remove SystemBatteryConsumer" into sc-dev 2021-05-04 01:47:34 +00:00
Chris Li
314e0d14c4 Merge "Determine whether to support activities in multi window (4/n)" into sc-dev 2021-05-04 01:32:36 +00:00
Jieru Shi
47fa996fb2 Add impression logging for media recommendation card 
Working sheet to figure out where to log impression and test scenarios https://docs.google.com/spreadsheets/d/1XZbRaS6vCWfSDwZ9prxiv5RFzdSg3a86C0zB-uSgJ-M/edit?resourcekey=0--PdUHvg7ZJ2NgbSkLs3abQ#gid=0

Bug: 181364757
Test: will append statsd_drive logs
Change-Id: I650d7c960b6e26efb39a32e5eacef01339e351a4
 2021-05-03 18:28:08 -07:00
Jackal Guo
e3e92e26c5 Merge "Migrate the usage of sCompatibilityModeEnabled" into sc-dev 2021-05-04 01:18:58 +00:00
Cecilia Hong
8ea28f9ce9 Merge "[BugFix] Fix the media reco expanded layout when there is less than 6 items." into sc-dev 2021-05-04 01:08:11 +00:00
Cecilia Hong
a0eac6bb92 Merge "Tap a media reco from lock screen: - Open the media activity directly in background to play; - Request to unlock the phone to open the media activity in foreground." into sc-dev 2021-05-04 00:54:23 +00:00
Songchun Fan
7a76d7f713 Merge "[IncrementalService] use sysfs_name in mount options and dumpsys" into sc-dev 2021-05-04 00:14:40 +00:00
Daniel Chapin
eed65ac6f5 Merge "Revert "Fix VIP conversations alerting incorrectly."" into sc-dev 2021-05-03 23:39:56 +00:00
Grace Jia
9eef1ea522 Provide all active subscriptions when register default app providers. 
Telecom was using old form SimCallManager getting method which was not
MSIM aware. User may found they don't have necessary permissions to call
if they have both eSIM and pSIM activated. Provide all SimCallManager
for active subscriptions to PermissionManager so that all of them can
get proper permissions.

Bug: 172880421
Test: Manually test call function on MSIM device
Change-Id: I87b26bdb9e99274a8adaa64c72cfac0a61f946bd
 2021-05-03 23:30:46 +00:00
Dmitri Plotnikov
79e65de313 Remove SystemBatteryConsumer 
which has been superceded by AggegateBatteryConsumer

Bug: 186006876
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: Use BatteryStatsViewer to verify that it's still functional
Change-Id: I2e4fe36ff310b6d68923fcecdfd22ce865b1f32d
 2021-05-03 16:03:39 -07:00
Ryan Mitchell
6c905696b9 Merge "AAPT: Only print last uses-sdk tag" into sc-dev 2021-05-03 23:00:16 +00:00
Todd Kennedy
48a2cac9ef Merge "Add OWNERS for new files" into sc-dev 2021-05-03 22:53:30 +00:00