Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,081 Commits 3 Branches 0 Tags
4bfaead345f4a9693ef929e450df2e17fa400836
Commit Graph

641081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
4bfaead345 [automerger skipped] Make framework-all depend on modules-utils-build am: 9fb1845e5a -s ours am: 2e44480716 -s ours am: 44f22bd54d -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: Ia800ad3d0e13dfd928400f8c15928c9238694927
 2021-05-04 14:17:05 +00:00
Joanne Chung
22c58ceba1 Merge "Fix UiTranslationStateCallback crash due to null locales." into sc-dev am: 2c6a3b5cd0 am: 97f4293f4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419522

Change-Id: I9e1c167f771089fb0f58b232802378cea0990718
 2021-05-04 14:16:54 +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
Henry Fang
9682bb5521 Merge "Make ACCESS_TUNER_RESOURCES a vendor privileged permission" into sc-dev am: 0f314d689f am: 029835a4fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14345797

Change-Id: Ib6cd4a82815b9d64f4c0d5e6c943ec8e04021c24
 2021-05-04 13:29:46 +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
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
470b7b5c25 Merge "Apply rotation animation when canceling fixed rotation" into sc-dev am: 25a8b5f625 am: 7f4fdd89b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14352468

Change-Id: I70d660be49639060dad2191f96d012a1905dfe86
 2021-05-04 12:33:18 +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
Stanislav Zholnin
a8b2419ff6 Merge "Add more explanation on difference between aggregate and discrete information." into sc-dev am: 3476ed1d68 am: 959e1d3889 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411200

Change-Id: Icb002b46e2b344361f489f6c117c94177591c200
 2021-05-04 11:41:05 +00:00
Jorim Jaggi
a4315a3670 Merge "Mark first frames in metrics properly" into sc-dev am: a4d6988f12 am: 25ae47fd4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411196

Change-Id: I53ba1ece1b9e65f8423c971bebe455ab72f53cfc
 2021-05-04 11:40:52 +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
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
4f1f6e828d Merge "DPM Check for unaffiliated secondary users" into sc-dev am: 345ff0cc74 am: 4c60a03778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325409

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

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

Change-Id: I469d1f409bbf17956e8047b29233f2e2a1d6f491
 2021-05-04 10:43:04 +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
Bill Lin
cce217b9ba Merge "Refine dump info of One Handed Mode components" into sc-dev am: 77f40a59bf am: 7cb819b5db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408817

Change-Id: I6991451d0fb3361692e197fd4d592eba2ae263c7
 2021-05-04 08:49:17 +00:00
Wu Ahan
6c6005ad35 Merge "Refine the latency and jank instrumentation of opening panel" into sc-dev am: bc299eb47a am: 047dfe766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340444

Change-Id: Iad322f6b25d6edbd385961ea2a9236e1a8b3ec86
 2021-05-04 08:48:54 +00: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
6cf1de0df5 Merge "Avoid intermediate orientation change" into sc-dev am: eee1089cb5 am: 4acef76393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14408958

Change-Id: If0e93cde611ee9afaa7c6258ee4d1468cf8d981c
 2021-05-04 07:03:52 +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
SongFerng Wang
980ce80f33 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev am: 19a0cc7574 am: ab2fa8a227 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14410156

Change-Id: I218330aae41297e33f42e9ee019ba5dc99e04133
 2021-05-04 05:50:57 +00:00
SongFerng Wang
ab2fa8a227 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" into sc-dev am: 19a0cc7574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14410156

Change-Id: If2260a0777c36f68ba6eefcdd68d7694cd425cb5
 2021-05-04 05:37:53 +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
055c45f8ec Merge "[IncrementalService] add last read error in dumpsys" into sc-dev am: 30253adb74 am: 8062fedf60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14387700

Change-Id: If6ae835874f3ebcaeac780acabcf1d66fad27b5c
 2021-05-04 05:06:00 +00:00
Songchun Fan
8062fedf60 Merge "[IncrementalService] add last read error in dumpsys" into sc-dev am: 30253adb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14387700

Change-Id: I80770c52fd8d9a873c0c4b9781c608e38bbf8cf1
 2021-05-04 04:59:58 +00:00
Nader Jawad
04c4d05eac Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7cf3 am: 88a5675778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414739

Change-Id: I350818badb3494bdf1bcdd1d160b187e79e1ca22
 2021-05-04 04:58:18 +00:00
George Mount
e3dfb4518a Remove edge effect type from the API. am: b1aee44bea am: 6c67f65481 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14390423

Change-Id: Id63ee66891a474e08a9218630c6f71b71fc674bd
 2021-05-04 04:58:15 +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
88a5675778 Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7cf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414739

Change-Id: Ieaa0d0bee9f352b3bff34fff87ade2a9ab5f6185
 2021-05-04 04:49:05 +00:00
George Mount
6c67f65481 Remove edge effect type from the API. am: b1aee44bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14390423

Change-Id: Icdc9197f2c67cf5cb9fe90f76359ecd3a8e8b644
 2021-05-04 04:49:02 +00:00
Grace Jia
6b47d88d82 Merge "Provide all active subscriptions when register default app providers." am: 9ef59ac901 am: 825f59adfe am: 1c653b4768 am: 0f2aea7903 am: 3ff296284a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1694533

Change-Id: Ib0e88b890b54cd980c012876dddd60cdb935ee56
 2021-05-04 04:47:53 +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