Mitch Phillips
73d00dba31
Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4 am: a78fe42a02
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibaf582b31bed34def5a7996a76e23680b32692ce
2021-02-08 22:11:58 +00:00
Jeff Sharkey
b7a004f27b
Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73 am: 8636af69ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3f07d249d780275379bd1477276f57004cd96d7
2021-02-08 22:11:43 +00: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
9911627eae
Merge "Pass ActivityOptions to HeavyWeightSwitcherAcivity." into sc-dev am: c8227c58fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13476229
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c2f776e05b2217a59ffb7528dea54ef598c6b19
2021-02-08 19:39:53 +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
TreeHugger Robot
915e3c5677
Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev am: 98ed521f0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473061
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icba0f82e5d734d1884fcd6e5ec39794245597b96
2021-02-08 18:38:12 +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
d65025e817
Merge "Check if CPU time tracking is expected to work" into sc-dev am: 64454600c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I920dccd78260efb691c8fa9092f0b1dd97bfa062
2021-02-08 17:11:33 +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
4b5b7b8049
Merge "am compat reset --no-kill shouldn't kill the process" into sc-dev am: 2c3254c775
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13497228
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf5591c47f37738157e954aee44c58fd91bc72cd
2021-02-08 16:39:50 +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
5011120e97
Merge "Rename InputConnecton#setImeTemporarilyConsumesInput" into sc-dev am: 3ae84f530b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482899
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic69bc45ea15293d36743aa9280b8a4a1bd9c9fdb
2021-02-07 03:53:56 +00:00
TreeHugger Robot
3ae84f530b
Merge "Rename InputConnecton#setImeTemporarilyConsumesInput" into sc-dev
2021-02-07 03:13:55 +00:00
Josh Gao
496317fc47
Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3 am: b4d05a90e9 am: e18b895a74
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f51c7c42ee249a66bd430f8e4c4282f718ab6f4
2021-02-05 22:09:35 +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
573cabce02
Merge "Add People widgets to those owned by System UI Notifications team" am: 460b1255a9 am: c088d267a1 am: d6e31fbd8b am: e10881e482
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577069
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I45752b375c78f9b938ca6057d950b33d78af9926
2021-02-05 20:36:46 +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
TreeHugger Robot
c421e48e33
Merge "Simplifying disabled widget view genration" into sc-dev am: 1890877201
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418746
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7884be68defa738a1391c3eff3f2db78dbe9dcac
2021-02-05 19:27:37 +00: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
a7012f1ef8
Merge "Change the API for getting PowerProfile-only BatteryUsageStats" into sc-dev am: 1ffcf97a14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454770
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4268af33879276e4fb9761e0f4b5b2119f98c3f0
2021-02-04 23:20:41 +00: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
1efd154346
Merge "Support multi font update internally." into sc-dev am: a397f0281c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464463
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22ea5a7497991c2fbf380527b1b8f7e8953c0e19
2021-02-04 22:36:59 +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
d89fe74bd9
Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." into sc-dev am: 804a79e7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430583
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35c8c63bbd4d5e6452e822e0d76e5f2f8df801d8
2021-02-04 20:05:24 +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
9e4605851b
Merge "Reduce LocationManager memory usage" into sc-dev am: 4c7e9d1a90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13463193
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b716b4f5e7d8883be2fc17415f207bcb940a4fc
2021-02-04 19:21:06 +00:00
TreeHugger Robot
d485acd997
Merge "use consistent method to generate constant value"
2021-02-04 19:19:15 +00:00
TreeHugger Robot
4c7e9d1a90
Merge "Reduce LocationManager memory usage" into sc-dev
2021-02-04 19:13:26 +00:00
Jing Ji
57388483af
Merge "Add an additional lock in the ActivityManagerService" into sc-dev am: 1d84f539e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425781
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb16058116c19aa4b0554d086b61da17171bcd63
2021-02-04 18:44:22 +00:00
Winson Chiu
60c73c783f
Merge changes from topic "domain-verify-sc-dev" into sc-dev am: bb85ae960f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13438570
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb1c263de3b6fd931102d4a6bfb01aa070a25ab0
2021-02-04 18:43:19 +00:00