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

648498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Chen
3db473fb61 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev am: c8bf38ce25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14305130

Change-Id: I014c3f314db5fe6c166e9833f5e8cadb15d01e96
 2021-05-11 04:19:23 +00:00
Charles Chen
c8bf38ce25 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev 2021-05-11 04:08:49 +00:00
TreeHugger Robot
df1bec857c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66fcb0d72d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I593bf941c4e9d7c18cd2e426484b85dfebc91899
 2021-05-11 04:05:30 +00:00
TreeHugger Robot
3601383271 [automerger skipped] Merge "Support global key can be dispatched from non-interactive" into sc-dev am: 55bd70ffe1 -s ours 
am skip reason: Merged-In I4eef4a5fd92baece995fa7ddf535f0791923f694 with SHA-1 fb7bf756f1 is already in history

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

Change-Id: I226c8bd436f3252a6a5836392df4b90221696e08
 2021-05-11 04:05:12 +00:00
TreeHugger Robot
66fcb0d72d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 04:01:00 +00:00
TreeHugger Robot
55bd70ffe1 Merge "Support global key can be dispatched from non-interactive" into sc-dev 2021-05-11 03:46:50 +00:00
Hongwei Wang
cf349815ff Merge "Unify round corner radius in PipSurfaceTransactionHelper(s)" into sc-dev am: 57618b94ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344122

Change-Id: I2827409a2a67dcf56b8cf1ab547d2422864543bb
 2021-05-11 03:38:53 +00:00
Hongwei Wang
00f867b7be Merge "Pass the float9 values in PictureInPictureSurfaceTransaction" into sc-dev am: 40c2601ec5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14451702

Change-Id: I0b796985fb2d78ab262614480ae4ede3095ca432
 2021-05-11 03:38:29 +00:00
Hongwei Wang
57618b94ef Merge "Unify round corner radius in PipSurfaceTransactionHelper(s)" into sc-dev 2021-05-11 03:23:11 +00:00
Hongwei Wang
40c2601ec5 Merge "Pass the float9 values in PictureInPictureSurfaceTransaction" into sc-dev 2021-05-11 03:20:17 +00:00
Edgar Wang
7e8a9205f8 Merge "Rename resource name to avoid build conflict in another path." into sc-dev am: ab7c9a5d79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14485336

Change-Id: I6a69e06881488ed0ef384efe0b0d571d79568788
 2021-05-11 02:40:28 +00:00
TreeHugger Robot
78e40a0530 Merge changes from topic "ClusterState.displayId" into sc-dev am: 793ae837f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14464335

Change-Id: I279401d04f446e0e39c1d3e27efb93cdfccacc6e
 2021-05-11 02:40:08 +00:00
Yuncheol Heo
3fd4817def Removes car.permission.ACCESS_PRIVATE_DISPLAY_ID from ClusterHome. am: 714df2c520 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14464334

Change-Id: Ief78f479f953c9b84a0a71c13ef5f54c405c7a9e
 2021-05-11 02:40:04 +00:00
Haiping Yang
edbaedf568 Merge "Add global settings keys for sysui package and main activity" 2021-05-11 02:33:46 +00:00
Edgar Wang
ab7c9a5d79 Merge "Rename resource name to avoid build conflict in another path." into sc-dev 2021-05-11 02:28:08 +00:00
TreeHugger Robot
793ae837f5 Merge changes from topic "ClusterState.displayId" into sc-dev 
* changes:
  Adds car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL to CarSystemUI.
  Removes car.permission.ACCESS_PRIVATE_DISPLAY_ID from ClusterHome.
 2021-05-11 02:20:28 +00:00
TreeHugger Robot
547d8d638c Merge "Fix NPE in AppExitInfo statsd logging" into sc-dev am: a5d90cd21a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14492035

Change-Id: I31c3e14ad4e95f511f5f126f9f5598bc77ab2341
 2021-05-11 01:49:40 +00:00
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
TreeHugger Robot
a5d90cd21a Merge "Fix NPE in AppExitInfo statsd logging" into sc-dev 2021-05-11 01:43:50 +00:00
Dmitri Plotnikov
7b32d78264 Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev 2021-05-11 01:24:56 +00:00
Arthur Hung
169f362e1c Support global key can be dispatched from non-interactive 
Add adddional element 'dispatchWhenNonInteractive' in global key xml to
allow it could be dispatched from non-interactive mode if the key is a
wake key. That could help user press button to wake device and send the
global button broadcast without pressing the same button twice.

The receiver could use 'GlobalKeyIntent.from(Intent)' to get the
detail global key information from the received Intent.

Bug: 183071267
Test: manual
Change-Id: I4eef4a5fd92baece995fa7ddf535f0791923f694
Merged-In: I4eef4a5fd92baece995fa7ddf535f0791923f694
 2021-05-11 01:10:38 +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
Jing Ji
9a03b11636 Fix NPE in AppExitInfo statsd logging 
Bug: 184859606
Bug: 154511130
Test: statsd_testdrive
Test: atest CtsStatsdAtomHostTestCases:AppExitHostTest
Change-Id: I50193d6dd734bfcc8241aa8d4edf487d742926ec
 2021-05-10 17:21:42 -07: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