drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,609 Commits 1 Branch 0 Tags
Commit Graph

635609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cd1feda701 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-13 21:20:58 +00:00
TreeHugger Robot
70f6ced807 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e841b21a2d -s ours am: 4aed3924ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac361b2a294578a5dc95464e7fb529d010e4588d
 2021-04-13 21:12:47 +00:00
TreeHugger Robot
23fbae438d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4392ab06ca -s ours am: 052741d9cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4afd27ddf55218dac7e9f0cd22ae2c0f9e375436
 2021-04-13 21:12:13 +00:00
Benedict Wong
ea4537c920 Merge "Remove unused variable in MtuUtils" 2021-04-13 21:10:31 +00:00
Mark Renouf
eaefe1464f Merge "Do not inset scrollBounds by padding unless clipToPadding==true" into sc-dev 2021-04-13 21:06:39 +00:00
Garfield Tan
d23762799b libhwui: Use wc instead of du to monitor file write 
du returns the disk space a file occupies, which isn't guaranteed to be
0 even if the file is empty on all file systems. Use "wc -c" instead to
obtain the file size.

Bug: 184878226
Test: The script waits for the file to have content on file system that
uses disk space to store empty files.
Test: Skia capture still works for Pixel.

Change-Id: Ib5f75b6712b476fc521a531fba029f91f4b281b5
 2021-04-13 20:43:49 +00:00
Patrick Baumann
001bc116ae Merge "Revert "Enable PackageManagerService snapshots"" into sc-dev 2021-04-13 20:32:33 +00:00
Silin Huang
4737c51520 Merge "Use isServiceAvailable for wallet tile availability" into sc-dev 2021-04-13 20:18:11 +00:00
Kohsuke Yatoh
bceed6d6ba Merge "Clear PersistentSystemFontConfig before update." into sc-dev 2021-04-13 20:09:13 +00:00
Zhen Zhang
c7c816a951 Merge "Rename API based on API review" into sc-dev 2021-04-13 20:07:53 +00:00
Patrick Baumann
d190547ef9 Revert "Enable PackageManagerService snapshots" 
This reverts commit 76f8d668b255ebaad3e430bc1ea06897199616cc.

Reason for revert: b/185150865
Bug: b/185150865
Change-Id: If314a341779c004bbbb8a5b525a93eb10a9e2651
 2021-04-13 19:58:38 +00:00
Jorim Jaggi
21142c13de Merge "Change hwui jank detection to use deadline & gpu completion (1/2)" into sc-dev 2021-04-13 19:58:27 +00:00
TreeHugger Robot
b8a744543c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-13 19:55:35 +00:00
John Reck
9f7e44d30d Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev 2021-04-13 19:50:53 +00:00
Rob Carr
211bf19cca Merge "Remove deferTransactionUntil" into sc-dev 2021-04-13 19:47:24 +00:00
TreeHugger Robot
4aed3924ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e841b21a2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9af489ae7bdd448c552c97d4478f1760a13fb970
 2021-04-13 19:46:52 +00:00
TreeHugger Robot
052741d9cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4392ab06ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07797cac716628abec9a1b1b2237498a506aecd3
 2021-04-13 19:46:33 +00:00
TreeHugger Robot
e841b21a2d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 19:42:21 +00:00
Bill Yi
53bcb12be5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If2372f39978002c6d087a2e6d8df4457caa92f77
 2021-04-13 19:41:47 +00:00
Jordan Liu
f8f0b73025 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60 am: 5b6f3db2ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: Ie6f18d05799607a2a48ba38d1ff62ce4683e868e
 2021-04-13 19:32:09 +00:00
Michel Comin Escude
9ed86141f2 Adjusted interpolation and stretch intensity 
Updated stretch intensity to 0.016 and added a new uniform to control
the intensity of the interpoloation

Bug: 183768138
Test: ran EdgeEffectTest and visual
Change-Id: Iac10bee5980802fffe838ed83e02b7c41dee6f71
 2021-04-13 12:30:51 -07:00
TreeHugger Robot
51ba9b3e44 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-13 19:28:07 +00:00
Eugene Susla
8a1a40d02c Rename CDM provider config property 
Also make it public for to be consistent with others

Test: ensure GMS gets teh CDM provider role
Bug: 181344542
Change-Id: I6cf1cebf1e4f225a88f6591cea449d15c85760b8
 2021-04-13 12:28:04 -07:00
Siim Sammul
50ddece0e9 Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." into sc-dev 2021-04-13 19:27:49 +00:00
TreeHugger Robot
4392ab06ca Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 19:25:34 +00:00
Lucas Dupin
b88361ef75 Merge "Allow first color event during SUW" into sc-dev 2021-04-13 19:25:33 +00:00
Dmitri Plotnikov
3885aa960b Add BatteryConsumer.getCustomPowerComponentName() and getCustomPowerComponentCount() 
Bug: 184207674
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: Ic41cf53e553a25caa8bb6c84c30e3ea2b7627281
 2021-04-13 12:16:13 -07:00
TreeHugger Robot
1ddf97e511 Merge "Use elapsed-time in AppTimeLimitController." into sc-dev 2021-04-13 19:09:40 +00:00
Danny Epstein
254953ec68 Merge "Allow getComponentName() to be used in tests" into sc-dev 2021-04-13 19:08:28 +00:00
Jordan Liu
5b6f3db2ab Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: I7fcd7fb06beb5dafe8f72d8cff5babd13e73bce2
 2021-04-13 19:07:25 +00:00
Matt Pietal
6ee6b37c2f Merge "QS Wallet priority placement" into sc-dev 2021-04-13 19:07:08 +00:00
Stefan Dierauf
e8d8d3dc85 Check appEntry is not null before dereferencing it 
Bug: 183791632
Test: make

Change-Id: Ic731f40031dca806428ffe85d6f2d10465ce7dea
 2021-04-13 18:57:08 +00:00
Automerger Merge Worker
025e7c2d26 [automerger skipped] Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 am: 51bbfddd7d -s ours 
am skip reason: skip tag Change-Id I94e2ecd2075a577c5362293622ce5be5167cd91a with SHA-1 7f3393d849 is already in history

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

Change-Id: I36c218a5a6ad39ca07e261bf6beac78361e7b523
 2021-04-13 18:52:34 +00:00
TreeHugger Robot
85cd22e0fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours am: 214718fbec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2c88b412d05f93d1f52510b67c4a1f075a80d62
 2021-04-13 18:52:14 +00:00
Yan Yan
0e817330e9 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 am: 735d9fe220 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I5ef61feb984e8562617853c178b19e93beb08bb2
 2021-04-13 18:51:58 +00:00
TreeHugger Robot
e159b9d964 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours am: 8ec76482fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia219d1dd512057a3c1595a850ad0bab928131ea0
 2021-04-13 18:51:33 +00:00
TreeHugger Robot
57805e14b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours am: fa811843fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01dedb5072545c36679273b62a3fd6377f64f4ab
 2021-04-13 18:51:08 +00:00
Shivam Agrawal
c7e2576fb6 Device-Specific Display Settings Should Not Be Applied During Tests 
Many tests use the device display(s), which may have override
settings applied such as ignoring activity requested orientation.
These settings are read in DisplayWindowSettingsProvider. This CL
introduces TestDisplayWindowSettingsProvider, which uses in-memory
settings storage, ensuring that tests never read from display config
files and never write to them either, preventing changes made to
displays during tests from persisting.

Bug: b/182499175
Test: atest WmTests
Change-Id: Iee63f77a83057b709630e1d2c2cf8dfc3ba88200
 2021-04-13 14:49:26 -04:00
Automerger Merge Worker
51bbfddd7d Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671839

Change-Id: I33e4430689838b4ecd3aea4e2fa031727151e7d2
 2021-04-13 18:46:31 +00:00
Jordan Liu
79bd307a60 Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663960

Change-Id: Ib5f376240ca9f1128e2edebcd7b5a9cf9319c7e6
 2021-04-13 18:45:53 +00:00
Anna Zappone
c8f4ca2a74 Merge "Update user profiles on user unavailable" into sc-dev 2021-04-13 18:39:45 +00:00
Jordan Liu
98833ee208 Merge "Override the label of the SIM Toolkit application dynamically" 2021-04-13 18:30:19 +00:00
Automerger Merge Worker
23c55673c6 Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master 2021-04-13 18:26:41 +00:00
TreeHugger Robot
214718fbec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd900bcd612dfc92643602502387b0ea549c6bbd
 2021-04-13 18:26:08 +00:00
Yan Yan
735d9fe220 Merge "Use IkeProtocolException#getErrorType() to identify a specific error" am: 7a50e7f206 am: b9b0d644a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672427

Change-Id: I0f4c7848fcc1ed5edc3da1b0712d60c7a8bcc57f
 2021-04-13 18:26:01 +00:00
TreeHugger Robot
8ec76482fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0308e8d2e22a840a06b3a9a36c629d9a682049e8
 2021-04-13 18:25:29 +00:00
TreeHugger Robot
fa811843fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ca5de2464 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab1bbd09e0c24030e6e396366a81537814afcee8
 2021-04-13 18:24:34 +00:00
TreeHugger Robot
b4f8703b7d Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 18:24:24 +00:00
Joshua Mccloskey
1ce11286e0 Merge "Added additional strings for fpm" into sc-dev 2021-04-13 18:21:01 +00:00
Anton Hansson
eaa90d0156 Merge "Update references incompatibilies files" am: 1ea3057847 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671839

Change-Id: I40a062d82dc00c3489700b0a43cd935679c3fda7
 2021-04-13 18:15:29 +00:00