Commit Graph

15676 Commits

Author SHA1 Message Date
Eugene Susla
24de1ca1be [DO NOT MERGE] Improvements and fixes for BLE scanning within CDM
Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972)
2021-02-08 16:51:49 -08:00
Mitch Phillips
a78fe42a02 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I675a403921d5d52eb1d65d2ff74af35517a7cf1f
2021-02-08 21:39:56 +00:00
Jeff Sharkey
8636af69ca Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I276ceb5deb6b2e689c867b27cb8f7395cd42d4f2
2021-02-08 21:38:20 +00:00
Mitch Phillips
e399fb29d4 Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43d5a38c75adbda0553e81235f49aa0aef7a8a3b
2021-02-08 19:43:53 +00:00
Jeff Sharkey
0192f22a73 Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbe90565c3df31a79bafa5a958a4df1ac1192fb0
2021-02-08 19:43:24 +00:00
Ben Lin
c8227c58fa Merge "Pass ActivityOptions to HeavyWeightSwitcherAcivity." into sc-dev 2021-02-08 19:28:12 +00:00
Mitch Phillips
4d7b7a71d6 Merge "[MTE] Parse MTE sysprop in system_server" 2021-02-08 18:46:52 +00:00
Jeff Sharkey
1cf122b5a7 Merge "Add OWNERS for CPU-related files" 2021-02-08 18:31:18 +00:00
TreeHugger Robot
98ed521f0a Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev 2021-02-08 18:31:11 +00:00
Treehugger Robot
b371a1c255 Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dabacbcd75c98ab81f933ba03f8f97720ba69b6
2021-02-08 17:23:55 +00:00
Rafal Slawik
ebc11b5899 Add OWNERS for CPU-related files
This covers files from CLs like:
- http://ag/13495669
- http://ag/13425120
- http://ag/13201721

Bug: n/a
Test: n/a
Change-Id: I7b1ba4e75c57cf53a9fe8b479b9472f627a63e82
2021-02-08 16:53:22 +00:00
Rafal Slawik
64454600c6 Merge "Check if CPU time tracking is expected to work" into sc-dev 2021-02-08 16:44:23 +00:00
TreeHugger Robot
2c3254c775 Merge "am compat reset --no-kill shouldn't kill the process" into sc-dev 2021-02-08 16:34:41 +00:00
Treehugger Robot
39d22680c9 Merge "Do not propogate test api access flags to Zygote." 2021-02-08 15:27:19 +00:00
Treehugger Robot
f9b15d961b Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd am: 8151e4c800 am: 255e25fcc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I945ec7dcc3c89fe7f4cc97b248a16f256f7c0c06
2021-02-07 21:16:01 +00:00
Treehugger Robot
255e25fcc3 Merge "Fix a bug in the USAP Pool refill logic." am: 905c2570cd am: 8151e4c800
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d24c25a0ab4bde791d1ddba37b9f59c1c1b6bb7
2021-02-07 20:40:38 +00:00
Treehugger Robot
905c2570cd Merge "Fix a bug in the USAP Pool refill logic." 2021-02-07 19:52:20 +00:00
TreeHugger Robot
3ae84f530b Merge "Rename InputConnecton#setImeTemporarilyConsumesInput" into sc-dev 2021-02-07 03:13:55 +00:00
Josh Gao
e18b895a74 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dd17a5aae56597a1eb233dd4743b4deb21ef5d9
2021-02-05 21:45:26 +00:00
Josh Gao
b4d05a90e9 Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22b7d2e823d131944d5b02996b8e3e92d2bbc2fa
2021-02-05 21:13:20 +00:00
Jeff Sharkey
e10881e482 Merge "Add People widgets to those owned by System UI Notifications team" am: 460b1255a9 am: c088d267a1 am: d6e31fbd8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577069

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfad672ab84feb4396d3ab93a3bc29abc9189dda
2021-02-05 20:23:25 +00:00
Josh Gao
ddaf564365 Merge changes I8b85d8ee,I789f41f1
* changes:
  Parse proto tombstones.
  Extract tombstone tracking to a separate service.
2021-02-05 20:11:10 +00:00
Makoto Onuki
4aa9369c5c am compat reset --no-kill shouldn't kill the process
Bug: 179499460
Test: manual test with:
`adb shell am compat reset --no-kill FGS_START_EXCEPTION_CHANGE_ID com.google.android.keep`

Change-Id: I604ff9d04967082e464c721263c6c0695af22c94
2021-02-05 11:49:19 -08:00
Jeff Sharkey
d6e31fbd8b Merge "Add People widgets to those owned by System UI Notifications team" am: 460b1255a9 am: c088d267a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577069

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddda0182bbb83b493073a0582d8da539e96acb62
2021-02-05 19:27:33 +00:00
TreeHugger Robot
1890877201 Merge "Simplifying disabled widget view genration" into sc-dev 2021-02-05 19:19:17 +00:00
Jeff DeCew
d5e38f04bb Add People widgets to those owned by System UI Notifications team
Change-Id: I15afb8f80a3d067af522707748a5b07c015af138
2021-02-05 14:09:02 +00:00
Lan Wei
66b21086e3 Rename InputConnecton#setImeTemporarilyConsumesInput
Rename InputConnecton#setImeTemporarilyConsumesInput as InputConnecton#setImeConsumesInput

Bug: 175362887
Bug: 179143513
Test: atest FrameworksCoreTests:TextViewTest
Test: atest CtsWidgetTestCases:TextViewTest

Change-Id: I8ac1ea4d53f747b0086ed415ff90793dfc6155bc
2021-02-05 12:16:22 +08:00
Mitch Phillips
b8d053a815 [MTE] Parse MTE sysprop in system_server
The system server inherits the ELF note from the Zygote, but should also
be able to be overwritten by the system property. This needs to be
manually parsed.

Bug: 172365548
Test: 'adb shell setprop arm64.memtag.process.system_server 123' \
Test: ... kill the system_server, and and look in logcat for
Test  ... "Unknown memory tag level for the system server".
Test: 'adb shell setprop arm64.memtag.process.system_server sync' \
Test: ... kill the system_server, and look in logcat for
Test: ... "SetHeapTaggingLevel: tag level set to 3".

Change-Id: Icda4ff141646086ae85d751b8af9b1fe94bfd7b5
2021-02-04 15:28:07 -08:00
Dmitri Plotnikov
1ffcf97a14 Merge "Change the API for getting PowerProfile-only BatteryUsageStats" into sc-dev 2021-02-04 22:55:11 +00:00
Kohsuke Yatoh
a397f0281c Merge "Support multi font update internally." into sc-dev 2021-02-04 22:23:33 +00:00
Todd Kennedy
032c92d481 use consistent method to generate constant value
Change-Id: I32b611661918628c5b8d125ff738069cd2940cb9
Merged-In: I32b611661918628c5b8d125ff738069cd2940cb9
(cherry picked from commit 01f8e8df13)
2021-02-04 20:47:25 +00:00
Evgenii Stepanov
804a79e7b0 Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." into sc-dev 2021-02-04 19:55:49 +00:00
Kohsuke Yatoh
f57788aaa5 Support multi font update internally.
This CL make UpdatableFontDir support multi font update in transaction.
The public / shell API is TBD.

Bug: 179103383
Test: atest CtsGraphicsTestCases:FontManagerTest
Test: atest FrameworksServicesTests:PersistentSystemFontConfigTest
Test: atest FrameworksServicesTests:UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: If9474a8ab81fe194b2d76080a4b066131fcd9e44
2021-02-04 11:32:28 -08:00
TreeHugger Robot
4c7e9d1a90 Merge "Reduce LocationManager memory usage" into sc-dev 2021-02-04 19:13:26 +00:00
Jing Ji
1d84f539e5 Merge "Add an additional lock in the ActivityManagerService" into sc-dev 2021-02-04 18:32:08 +00:00
Winson
3c7113a401 Remove legacy IntentFilterVerificationManager
Completely deletes all the code for v1 of domain verification,
delegating everything to the new DomainVerificationService.

Exempt-From-Owner-Approval: Already approved by owners on main branch

Bug: 171251883

Test: none, removal of effectively dead code

Change-Id: Ib222ccd46019c1c28b402c0f68466077b62871c1
2021-02-04 10:27:00 -08:00
Winson
2641e601cc Add domain verification API classes
Includes the request class sent to the verification agent and the 2
data classes returned by the to-be-added DomainVerificationManager.

Exempt-From-Owner-Approval: Already approved by owners on main branch

Bug: 163565712
CTS-Coverage-Bug: 179382047

Test: atest DomainVerificationCoreApiTest

Change-Id: If9f1b987f0d06c930f6c44b58af101b83947acb9
2021-02-04 10:26:57 -08:00
Winson
1e8c37a0dc Refactor legacy domain verification code
Moves everything to com.android.server.pm.intent.verify.legacy, in
preparation for replacement with new classes.

No functional changes were made, although the code may be slightly
slower since lambdas are now passed around to do locking.

Eventually the entire legacy package will be deleted. Any attempts at
backwards compatbility will involve a brand new wrapper of the v1 APIs
which delegate into the v2 methods.

Exempt-From-Owner-Approval: Already approved by owners on main branch

Bug: 163565078

Test: atest IntentFilterVerificationTest
Test: manual, verify with `dumpsys package d` that an app auto verifies

Change-Id: Id7d428b939cab6dd887567abcc7ba0e8f3fb7638
2021-02-04 10:26:57 -08:00
Artur Satayev
bff33b8c31 Do not propogate test api access flags to Zygote.
The flow has been replaced by @ChangeId ALLOW_TEST_API_ACCESS, making
old approach obsolete.

Bug: 147113465
Test: atest CameraEvictionTest#testBasicCamera2ActivityEviction
Merged-In: I0bf109fa78212d6d71ba85d25f80e27e8e7cd900
Merged-In: I0e58b6924744590afaadec6a6230aa9d552b2f6f
Change-Id: I9cf8f80abb0165d4aefbf943bade57f5e031904b
Exempt-From-Owner-Approval: cp
Bug: 178391911,147113465
(cherry picked from commit a27cd30535)
2021-02-04 17:17:44 +00:00
TreeHugger Robot
9093da8884 Merge "Avoid detecting WebView as TYPE_RECYCLING" into sc-dev 2021-02-04 12:40:12 +00:00
Adam Bookatz
6344e2dbe8 Merge "MeasuredEnergyStats supports custom energy buckets" into sc-dev 2021-02-04 08:38:15 +00:00
Galia Peycheva
bf21f495df Merge "Make window blur behind public API" into sc-dev 2021-02-04 08:31:45 +00:00
Jing Ji
cfeb2866a4 Add an additional lock in the ActivityManagerService
This CL breaks down the ProcessRecord by the characteristic of
the fields in it. It's a preparation for future CLs, to let
the various components in the ActivityManagerService to access
its own correlated data class only.

Also introduces an additional semi-global lock in the
ActivityManagerService as an effort to reduce the lock contentions.
Some of the data fields now requires either the legacy global lock
or this new lock to read from it, and both of the lock to write to it.

Bug: 162450085
Test: atest CtsAppTestCases
Test: atest FrameworksMockingServicesTests
Test: atest FrameworksServicesTests
Change-Id: I2718dfb8cd5c1852e81280ed11676c567f76d0a2
2021-02-03 20:53:40 -08:00
vadimt
2351f764da Adding All Apps CUJs to InteractionJankMonitor
Test: presubmit
Bug: 178656784, 178656812
Change-Id: I7b87d81a12d372bb20fb95c173eec67f34986cfe
2021-02-03 18:45:39 -08:00
Adam Bookatz
696dd2af2d MeasuredEnergyStats supports custom energy buckets
MeasuredEnergyStats now supports a variable number of
'buckets', including both the standard buckets (fixed number)
and additional custom buckets (variable number) whose meaning
is unknown to BatteryStats (but is enumerated as an 'ordinal').
This will be used to store per-uid energy data from custom
power components.

Test: atest MeasuredEnergyStatsTest
Test: atest com.android.internal.os.BatteryStatsTests
Bug: 179107328
Bug: 174186358
Change-Id: I0022ac6940daca5f1e7d0e502eed01effa71f796
2021-02-04 02:26:31 +00:00
Benjamin Schwartz
d42057fc61 Merge "BatteryStats: Pull subsystem stats from Power Stats Service" into sc-dev 2021-02-04 01:39:09 +00:00
Bill Yi
46b48bcc66 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
Merged-In: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
Change-Id: Ibfd6d85bda975aaa274be9e98e197de048d178ac
2021-02-03 17:01:38 -08:00
Adam Bookatz
52534776ec Merge "Measured screen energy into BatteryStatsHelper" into sc-dev 2021-02-04 00:33:10 +00:00
Ben Lin
52e7ab8b6f Pass ActivityOptions to HeavyWeightSwitcherAcivity.
We already pass a bunch of things to it, including an IntentSender, so
pass along the ActivityOptions to respect the original options if there
was any.

Bug: 174318905
Test: atest
android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch

Change-Id: I792eb2a021cddf8b92fe405feb8f3b9b5ce37b03
2021-02-04 00:31:19 +00:00
Sunny Goyal
4671a2d556 Simplifying disabled widget view genration
Removing creating and holding icon bitmaps in systemServer and
directly loading resources in the Host process

Bug: 178616010
Test: Verified View on device
Change-Id: I4abf616985d68ac48f55856bb90fa598a4cebe1c
2021-02-03 22:53:12 +00:00