Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
648,470 Commits 3 Branches 0 Tags
f2cbb1015cf9419ddbee3e0f68fa8a1b507300a9
Commit Graph

648470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
f2cbb1015c Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev am: 7b32d78264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14207705

Change-Id: I8c67f52f8a94c3ac6ed62e3383824baaaba33d05
 2021-05-11 01:49:23 +00:00
Dmitri Plotnikov
7b32d78264 Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev 2021-05-11 01:24:56 +00:00
Menghan Li
1770367341 Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev am: f774ba0dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419594

Change-Id: Ice644ef88d2b38e4885d8bcb63e365b71ce5f9e0
 2021-05-11 01:06:34 +00:00
Menghan Li
f774ba0dac Merge "Apply dark theme for volume key shortcut warning dialog" into sc-dev 2021-05-11 00:57:44 +00:00
John Li
cb5837ffb5 Merge "Add javadoc for Secure.UI_TRANSLATION_ENABLED" into sc-dev am: ebad1be9bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14484642

Change-Id: Ic908223838c34bad7394d79ba4dc67ede390e774
 2021-05-11 00:51:06 +00:00
John Li
ebad1be9bb Merge "Add javadoc for Secure.UI_TRANSLATION_ENABLED" into sc-dev 2021-05-11 00:45:55 +00:00
TreeHugger Robot
1d64b831c6 Merge "Try to create Typeface before writing to config file" into sc-dev am: 661c982576 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14488945

Change-Id: Iab92f9c57e2a42a3112cccfbf7710feaab16e1ab
 2021-05-11 00:27:33 +00:00
Bill Yi
b85afe562a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd2554e2cf -s ours am: ec34735d24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie92afd1500ce7c2fdf38ea12b645429ba6bb0192
 2021-05-11 00:27:25 +00:00
TreeHugger Robot
d11c3b8161 Merge "[am] check if codePath is null before checking incremental" into sc-dev am: 33fb25731a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14488014

Change-Id: I7f5e9851268ee9816617b1467655adadef6888cd
 2021-05-11 00:27:10 +00:00
TreeHugger Robot
af276b56b6 Merge "BatteryStatsViewer UI improvements:" into sc-dev am: 54fc08e8cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14448845

Change-Id: Ifc5f66207c52bfc66f1b72deaba77326508a0c85
 2021-05-11 00:26:20 +00:00
TreeHugger Robot
661c982576 Merge "Try to create Typeface before writing to config file" into sc-dev 2021-05-11 00:24:44 +00:00
Bill Yi
ec34735d24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd2554e2cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad88d96ddbb1f3ffc50580d8587eea0298ea6ce3
 2021-05-11 00:17:33 +00:00
TreeHugger Robot
33fb25731a Merge "[am] check if codePath is null before checking incremental" into sc-dev 2021-05-11 00:13:09 +00:00
TreeHugger Robot
54fc08e8cb Merge "BatteryStatsViewer UI improvements:" into sc-dev 2021-05-11 00:11:03 +00:00
Vova Sharaienko
818478e2d8 Merge changes from topic "reroute-lmkd-ams" into sc-dev am: 85e554b8d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14472325

Change-Id: I2fa0f605422d49941dc8cb76efa5990410c56b73
 2021-05-10 23:45:57 +00:00
Vova Sharaienko
85e554b8d8 Merge changes from topic "reroute-lmkd-ams" into sc-dev 
* changes:
  AMS: added caching DataInputStream object
  ActivityManagerService: reroute lmkd atoms logging
 2021-05-10 23:41:04 +00:00
Yi Jiang
f29b652cee Merge "Simplifies the service resolving logic in RRMS" into sc-dev am: 1e577bb281 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414064

Change-Id: Ib5bd4fb0d7393297498c25e6868b09a7c80d9f90
 2021-05-10 23:37:13 +00:00
TreeHugger Robot
d27012ce12 Merge "Remove char limit for new user dialog message" into sc-dev am: 8a67239a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14470828

Change-Id: I2958f577edcfd47024cadcf29504d4c741704c7c
 2021-05-10 23:36:42 +00:00
Yi Jiang
1e577bb281 Merge "Simplifies the service resolving logic in RRMS" into sc-dev 2021-05-10 23:30:48 +00:00
TreeHugger Robot
8a67239a67 Merge "Remove char limit for new user dialog message" into sc-dev 2021-05-10 23:20:06 +00:00
Benedict Wong
a50e34f29f Merge "Add additional logging to improve debugability of VcnManagementService" am: 3996048bad am: 30b760733b am: 4182201ae9 am: a91e5123fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692661

Change-Id: I981867dcd64c765ff528c7238c3381f45d8f7550
 2021-05-10 22:29:08 +00:00
Brad Ebinger
c2c06a3a28 [automerger skipped] Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143 am: e8d7017b66 am: 5272296d19 -s ours am: 16ccba2dee -s ours 
am skip reason: Merged-In I4b0f9882dcf36e2ff7151778cbadb8e83513df5a with SHA-1 5934699aab is already in history

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

Change-Id: I155167ebb6e385bfff8c86f54828cd3a28cabd98
 2021-05-10 22:28:29 +00:00
Makoto Onuki
cc1c018c62 Merge "Send a broadcast when an app is granted SCHEDULE_EXACT_ALARM" into sc-dev am: 26f28d4a29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457624

Change-Id: I8c18065d53d7532f53a519c03b24f956a9c674c2
 2021-05-10 22:27:58 +00:00
Nader Jawad
b2bddd31ff Merge "Add a linear variant of the stretch effect" into sc-dev am: 020efbc1a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14488483

Change-Id: I44b18226e6a504d4ab53cbafa6fb1f24949ad899
 2021-05-10 22:26:53 +00:00
Benedict Wong
a91e5123fc Merge "Add additional logging to improve debugability of VcnManagementService" am: 3996048bad am: 30b760733b am: 4182201ae9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692661

Change-Id: I24973d2eff043af411460df6227954e55249f2ec
 2021-05-10 22:21:30 +00:00
Brad Ebinger
16ccba2dee [automerger skipped] Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143 am: e8d7017b66 am: 5272296d19 -s ours 
am skip reason: Merged-In I4b0f9882dcf36e2ff7151778cbadb8e83513df5a with SHA-1 5934699aab is already in history

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

Change-Id: I466ecb4434215b8d081c5a23342708a72d67b172
 2021-05-10 22:20:44 +00:00
Dmitri Plotnikov
e43992bbdb Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats 
Bug: 162380414
Test: atest FrameworksCoreTests:BatteryUsageStatsTest

Change-Id: Icb508c60e037ee983c0ebde5905ec0a08fe648c3
 2021-05-10 15:20:18 -07:00
Makoto Onuki
26f28d4a29 Merge "Send a broadcast when an app is granted SCHEDULE_EXACT_ALARM" into sc-dev 2021-05-10 22:14:48 +00:00
Nader Jawad
020efbc1a8 Merge "Add a linear variant of the stretch effect" into sc-dev 2021-05-10 22:12:48 +00:00
Benedict Wong
4182201ae9 Merge "Add additional logging to improve debugability of VcnManagementService" am: 3996048bad am: 30b760733b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692661

Change-Id: I4837423409cb93232a80e29164962343d743febd
 2021-05-10 22:01:40 +00:00
Brad Ebinger
5272296d19 Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143 am: e8d7017b66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699607

Change-Id: Ia0c185d18b404a35c116b35309008c67ecc271b2
 2021-05-10 22:01:23 +00:00
Benedict Wong
30b760733b Merge "Add additional logging to improve debugability of VcnManagementService" am: 3996048bad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692661

Change-Id: I1597db8e8f437b797abdb70253f7b7a0fc6b77dd
 2021-05-10 21:44:38 +00:00
Brad Ebinger
e8d7017b66 Merge "Add the REGISTRATION_TECH_NR Tech type" am: 0ad0a88143 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699607

Change-Id: I2009c95ad2d87b4d3a23fbe62de32d1081874dc4
 2021-05-10 21:37:35 +00:00
TreeHugger Robot
2e9ea0d192 Merge "Add TODO to SoundTriggerMiddlewarePermission hack" into sc-dev am: d825a07bc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14390413

Change-Id: I2bea99db948e8a9c416c1ce35d7fd78eade69445
 2021-05-10 21:36:34 +00:00
Siim Sammul
994005975e [automerger skipped] Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." am: 60cd2fa626 am: 0e29db726c am: e29e864c6f -s ours am: d3dc23dd45 -s ours 
am skip reason: Merged-In I8a123f7aed7c0ce416814372f2287b04a8a04ac0 with SHA-1 c31917ddd4 is already in history

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

Change-Id: Ie9df2879017520d27107fe44e7238e34facd8ef1
 2021-05-10 21:36:22 +00:00
Rahul Sabnis
014b61f9b2 Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded." am: d8c539d8b8 am: 27918f0cf2 am: 634cd45795 am: 30002e7cd3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769

Change-Id: I405bb1442d74ee9a83e1b18a65f9ec8da632b327
 2021-05-10 21:35:58 +00:00
TreeHugger Robot
d825a07bc4 Merge "Add TODO to SoundTriggerMiddlewarePermission hack" into sc-dev 2021-05-10 21:34:57 +00:00
Benedict Wong
3996048bad Merge "Add additional logging to improve debugability of VcnManagementService" 2021-05-10 21:22:23 +00:00
Siim Sammul
d3dc23dd45 [automerger skipped] Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." am: 60cd2fa626 am: 0e29db726c am: e29e864c6f -s ours 
am skip reason: Merged-In I8a123f7aed7c0ce416814372f2287b04a8a04ac0 with SHA-1 c31917ddd4 is already in history

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

Change-Id: Ifa0ff35c5aac39865654681cd4af922696b41c1b
 2021-05-10 21:22:05 +00:00
Rahul Sabnis
30002e7cd3 Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded." am: d8c539d8b8 am: 27918f0cf2 am: 634cd45795 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769

Change-Id: I0b4ae79183c1b6e72c75369a25ca375acd4e5331
 2021-05-10 21:21:20 +00:00
TreeHugger Robot
6e97fa9812 Merge "Fix segmentation fault in aapt2" 2021-05-10 21:14:20 +00:00
Automerger Merge Worker
043a83520d Merge "Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6" into stage-aosp-master am: c8c54db537 am: e24feb4224 am: cad1671717 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699071

Change-Id: I66546bb36c73a9c7dce0736c4bc496f08874f5e4
 2021-05-10 21:05:48 +00:00
Calin Juravle
88da50634c Merge "Enforce system/root/shell for dexopt operation." am: c900ba3cd6 am: 274d5098fe am: ad770e97d4 am: b5d991b3e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699071

Change-Id: Ib1f99a68cdcc9acfc515b10f13de8f7ae98eab57
 2021-05-10 21:04:57 +00:00
Automerger Merge Worker
b52dd14b10 Merge "Merge "AudioFormat: Retrieve sample rate capability from framework" am: ba32f57428" into stage-aosp-master am: bbffe8e909 am: 800b64ec90 am: 2355ccca25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700287

Change-Id: Idc625179cc80f45be9c8fbd24779ee50e468a6f4
 2021-05-10 21:04:38 +00:00
Siim Sammul
e29e864c6f Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." am: 60cd2fa626 am: 0e29db726c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697178

Change-Id: I0af62c50b32487734cc49a0f649c544728179593
 2021-05-10 21:03:50 +00:00
Andy Hung
9120054c96 Merge "AudioFormat: Retrieve sample rate capability from framework" am: ba32f57428 am: 89ce768aa1 am: 4a47417302 am: ce18518dca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700287

Change-Id: Ia59de79b9e6731df0150d9ee4b56a834ce75851f
 2021-05-10 21:03:28 +00:00
Rahul Sabnis
634cd45795 Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded." am: d8c539d8b8 am: 27918f0cf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769

Change-Id: I47b4ad9a346b2f384790541928cf7eaae5edddc7
 2021-05-10 21:02:56 +00:00
Brad Ebinger
0ad0a88143 Merge "Add the REGISTRATION_TECH_NR Tech type" 2021-05-10 21:02:25 +00:00
Bill Yi
bd2554e2cf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I786a9fe4073de6356b45fbaa88cfe5247788a274
 2021-05-10 20:59:47 +00:00
Siim Sammul
0e29db726c Merge "Create BinderLatencyObserver to collect binder call latency stats. Pushing these as a metric will come in a future change." am: 60cd2fa626 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697178

Change-Id: I025d7728e7cc5dd6a3491d254013f7832ea4b01d
 2021-05-10 20:44:20 +00:00