Commit Graph

643807 Commits

Author SHA1 Message Date
Tianjie Xu
31fd2de6e9 Merge "Add an error code for RoR failure due to no network" am: 6890be9218 am: aa535537f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716971

Change-Id: I82c80e848552ed81eedc4042ef33f50520699ea8
2021-05-26 04:46:47 +00:00
Tianjie Xu
aa535537f7 Merge "Add an error code for RoR failure due to no network" am: 6890be9218
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716971

Change-Id: I70fbb3844af94d4f15ba734f5d52d4bb59cfbded
2021-05-26 04:09:33 +00:00
Tianjie Xu
6890be9218 Merge "Add an error code for RoR failure due to no network" 2021-05-26 03:47:58 +00:00
vichang
7da86d8d3e Merge "Refactor ddm ChunkHandler utility methods from libcore to framework" am: efc3806b1c am: 2d170271ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686655

Change-Id: I23ef95bb40a210baebd22343dca0757675551069
2021-05-26 01:07:30 +00:00
vichang
2d170271ea Merge "Refactor ddm ChunkHandler utility methods from libcore to framework" am: efc3806b1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686655

Change-Id: I4e7c920a60b6c65fcf046207215ed452094ab866
2021-05-26 00:44:42 +00:00
vichang
efc3806b1c Merge "Refactor ddm ChunkHandler utility methods from libcore to framework" 2021-05-26 00:26:20 +00:00
Treehugger Robot
4c2e19766f Merge "Add OWNERS for StorageStats related code." am: 1050f27b56 am: fc716dbc8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716368

Change-Id: Ib34358f3baae6a233475f83f2db3770d91c849e4
2021-05-25 23:39:02 +00:00
Treehugger Robot
fc716dbc8b Merge "Add OWNERS for StorageStats related code." am: 1050f27b56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716368

Change-Id: I09e782d1a383d26e3a85165860323c17c4387354
2021-05-25 23:08:41 +00:00
Treehugger Robot
1050f27b56 Merge "Add OWNERS for StorageStats related code." 2021-05-25 22:47:21 +00:00
Brad Ebinger
1cba9be5c8 Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" am: e2540fd31f am: bebe46bfb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702026

Change-Id: Ic5ac0f6a6468b8e4977edf3eef4785a417e57794
2021-05-25 21:26:13 +00:00
Brad Ebinger
bebe46bfb0 Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" am: e2540fd31f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702026

Change-Id: I73dd2748164dd81856f5803031324f079bf1fb17
2021-05-25 21:11:02 +00:00
Brad Ebinger
e2540fd31f Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" 2021-05-25 20:48:31 +00:00
Paul Duffin
f43953e242 Merge "Move conscrypt related hidden API flag file contents" am: 442283ace3 am: c739b66f79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715901

Change-Id: Ib789520a8d08cb784d26b852e7797082ee496a71
2021-05-25 18:44:17 +00:00
Christian Wailes
83e09badb4 Merge "Reset stack guard after fork from Zygote" am: 2df0b0fd74 am: e8d0aeac1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587775

Change-Id: I21c1c4cd4b0c6f4ae13db5175d5e22075ec08aae
2021-05-25 18:42:48 +00:00
Paul Duffin
c739b66f79 Merge "Move conscrypt related hidden API flag file contents" am: 442283ace3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715901

Change-Id: I2ac20f81899b3193c01dd98a6b477d67a009f6cf
2021-05-25 18:34:28 +00:00
Paul Duffin
442283ace3 Merge "Move conscrypt related hidden API flag file contents" 2021-05-25 18:25:37 +00:00
Christian Wailes
e8d0aeac1e Merge "Reset stack guard after fork from Zygote" am: 2df0b0fd74
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587775

Change-Id: I8a432e2d5dd669c1ee7b3bae6e0c216ea1eee63a
2021-05-25 18:19:13 +00:00
Christian Wailes
2df0b0fd74 Merge "Reset stack guard after fork from Zygote" 2021-05-25 17:47:39 +00:00
Steven Moreland
dfd993c108 Merge "Revert "binder: race condition by parcel finalize"" am: 58787794eb am: dfda61b6c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714912

Change-Id: Ib49169804c1fa120d8fdfc9cee3531bb0baa4a34
2021-05-25 17:42:12 +00:00
Siim Sammul
6462be05e5 [automerger skipped] Merge "Add a version of SettingsObserver to BinderCallsStats and make it public so it could be used to collect binder latency data from bluetooth and telephony." am: e900587533 am: 0def8a3786 -s ours
am skip reason: Merged-In Ide51afb7eb26a96c7692bceb0a22585a74f08aa7 with SHA-1 58f933471d is already in history

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

Change-Id: Ia360a2166de24062e58431619c976c0bcfb4bf0f
2021-05-25 17:41:41 +00:00
Steven Moreland
dfda61b6c7 Merge "Revert "binder: race condition by parcel finalize"" am: 58787794eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714912

Change-Id: I1173630866723ad7ee7f8958403613917fbc05d5
2021-05-25 17:33:26 +00:00
Steven Moreland
58787794eb Merge "Revert "binder: race condition by parcel finalize"" 2021-05-25 17:23:35 +00:00
Siim Sammul
0def8a3786 Merge "Add a version of SettingsObserver to BinderCallsStats and make it public so it could be used to collect binder latency data from bluetooth and telephony." am: e900587533
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1717631

Change-Id: I86be5b0682e148b3b2af1f5635667c77d8b7c86d
2021-05-25 17:17:17 +00:00
Andrei-Valentin Onea
72e2545e7d Merge "Add PLATFORM_COMPAT_SERVICE to SystemServiceRegistry" am: 6dcc612d7a am: 9de3a37aec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716912

Change-Id: I7f60667724d5e0bac8cd2d22fb8df65ddfd1f161
2021-05-25 17:09:57 +00:00
Siim Sammul
e900587533 Merge "Add a version of SettingsObserver to BinderCallsStats and make it public so it could be used to collect binder latency data from bluetooth and telephony." 2021-05-25 16:52:23 +00:00
Andrei-Valentin Onea
9de3a37aec Merge "Add PLATFORM_COMPAT_SERVICE to SystemServiceRegistry" am: 6dcc612d7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716912

Change-Id: I2a009975b2c8fc14424b59485ce836cd4bf3cf85
2021-05-25 16:39:23 +00:00
Andrei-Valentin Onea
6dcc612d7a Merge "Add PLATFORM_COMPAT_SERVICE to SystemServiceRegistry" 2021-05-25 16:21:14 +00:00
Siim Sammul
8cecd22d29 Add a version of SettingsObserver to BinderCallsStats and make it public so it could be
used to collect binder latency data from bluetooth and telephony.

This is a direct cherry pick from internal with no changes: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/14236409

Test: latency collection is unit tested, this is just an alternative settings configuration
Bug: 180584913
Change-Id: Ide51afb7eb26a96c7692bceb0a22585a74f08aa7
Merged-In: Ide51afb7eb26a96c7692bceb0a22585a74f08aa7
2021-05-25 15:20:22 +01:00
Nikita Iashchenko
77f6bbff3c Refactor ddm ChunkHandler utility methods from libcore to framework
As a part of internal libcore cleanup three utility methods for ddm
chunks (de)serialization were removed from the CorePlatformApi set and
moved to framework.

As a part of API council review made following changes:
 * Renamed connected/disconnected callback methods to
   onConnected/onDisconnected, respectively
 * Made unregisterHandler method a part of core api
 * Renamed threadNotify/enableRecentAllocations setters

Bug: 154796679
Bug: 184654804
Test: m droid
Change-Id: I1d43f12aaf70c7c079577d3f3248248ed39f9865
2021-05-25 14:29:21 +01:00
Tom Natan
bcd3b7b188 Merge "Fix deadlock on CompatConfig.mChanges" am: 7f40181620 am: e5e54383e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710632

Change-Id: Ie5b658d90371a1c698c5007a772c01b7db2444cd
2021-05-25 13:20:28 +00:00
Treehugger Robot
d65c5bc755 Merge "CEC: Add <User Control Pressed> information in dumpsys." am: 6933315ff2 am: c2924840c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708336

Change-Id: Iea7599e29535195459bb6af1880f25078780e547
2021-05-25 13:20:09 +00:00
Treehugger Robot
81742334ee Merge "Add lihongyu@ and mariiasand@ to WM OWNERS file" am: 8b0141d77b am: e2cb4a658c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716970

Change-Id: Ie2881e72698f6aa90b98b5c7ea88c5f90e48abcd
2021-05-25 13:19:38 +00:00
Tom Natan
e5e54383e6 Merge "Fix deadlock on CompatConfig.mChanges" am: 7f40181620
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710632

Change-Id: I1eaf9793024297222336cc81dfd2d169395b8c2a
2021-05-25 12:31:56 +00:00
Treehugger Robot
c2924840c0 Merge "CEC: Add <User Control Pressed> information in dumpsys." am: 6933315ff2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708336

Change-Id: I3474e23681ce2dcc2647ef6168c36c80352b09cc
2021-05-25 12:28:50 +00:00
Treehugger Robot
e2cb4a658c Merge "Add lihongyu@ and mariiasand@ to WM OWNERS file" am: 8b0141d77b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716970

Change-Id: I7941aaff6abede27f271af649bf0897dc5d65f1d
2021-05-25 12:25:13 +00:00
Andrei Onea
c0b0a3bcb3 Add PLATFORM_COMPAT_SERVICE to SystemServiceRegistry
Cache PLATFORM_COMPAT_SERVICE in SystemServiceRegistry.

Test: m
Bug: 188823360
Change-Id: Ideea2bd5e9ab19a931159ddced6ffcadfb66205c
2021-05-25 13:15:30 +01:00
Tom Natan
7f40181620 Merge "Fix deadlock on CompatConfig.mChanges" 2021-05-25 12:09:26 +00:00
Treehugger Robot
6933315ff2 Merge "CEC: Add <User Control Pressed> information in dumpsys." 2021-05-25 10:32:59 +00:00
Treehugger Robot
8b0141d77b Merge "Add lihongyu@ and mariiasand@ to WM OWNERS file" 2021-05-25 09:08:19 +00:00
Siim Sammul
1c8a46e689 [automerger skipped] Merge "Add buckets params to the binder latency atom" am: 5141d67365 am: 1aa837f142 -s ours
am skip reason: Merged-In I20d8f5632f76774cad64af30a6aa1f1ab172152f with SHA-1 cceed4f3dc is already in history

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

Change-Id: Ic2ef4a50f70d0877b243b94bab518b00f5ab667c
2021-05-25 09:07:35 +00:00
Siim Sammul
1aa837f142 Merge "Add buckets params to the binder latency atom" am: 5141d67365
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715891

Change-Id: I1e350175216c8bec88be7ec290b9f852f9f361ef
2021-05-25 08:41:18 +00:00
Siim Sammul
5141d67365 Merge "Add buckets params to the binder latency atom" 2021-05-25 08:02:25 +00:00
Treehugger Robot
fb71e91a20 [automerger skipped] Merge "Make Pip usage of FrameCallbackScheduler an actual class" am: 5930b62e2f am: 93b095bc36 -s ours
am skip reason: Merged-In I1632bd87a0f02940317a38a87b074d303f80b8c7 with SHA-1 c6c603078b is already in history

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

Change-Id: I4c36e3fa3cd7e1b8c33a310ae9b6cdc18fa9390f
2021-05-25 06:59:07 +00:00
Treehugger Robot
93b095bc36 Merge "Make Pip usage of FrameCallbackScheduler an actual class" am: 5930b62e2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714757

Change-Id: I70cda45c5363c90501cc5ad3ff95fa820757fe44
2021-05-25 06:36:29 +00:00
Treehugger Robot
5930b62e2f Merge "Make Pip usage of FrameCallbackScheduler an actual class" 2021-05-25 06:05:01 +00:00
Treehugger Robot
4120a8bd82 [automerger skipped] Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e am: 48bd481559 -s ours
am skip reason: Merged-In Ic5e449e514a996f90b815e56fe136ac1f453496e with SHA-1 77f9e2adfc is already in history

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

Change-Id: I786b1afd0c0e672c74505970d141a4a13464353d
2021-05-25 03:49:51 +00:00
Treehugger Robot
48bd481559 Merge "Should not try IMS or EMERGENCY APN for initial-attach." am: df7fddd96e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709709

Change-Id: I910096cd8a62ed6d8afde79fc166037db5319810
2021-05-25 03:06:22 +00:00
Treehugger Robot
df7fddd96e Merge "Should not try IMS or EMERGENCY APN for initial-attach." 2021-05-25 02:48:51 +00:00
Howard Chen
fd89f0cf17 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" am: af5c516b49 am: 26bad177d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710289

Change-Id: I1353b58528ed80e56b11259c94dce7397aac09bd
2021-05-25 02:17:35 +00:00
Howard Chen
26bad177d3 Merge "Corrupt the PersistentDataBlock payload explicitly in factory reset" am: af5c516b49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710289

Change-Id: Ic2caf36348295c5075bfef46e3b3c113daf75930
2021-05-25 01:58:00 +00:00