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

16503 Commits

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
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
Jorim Jaggi
c81312dac7 Merge "Correctly start tracing only where we are counting frames" into sc-dev am: 5f6968d277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411197

Change-Id: Iecd52b9c65179d44ac3d2b0c50f71f843c3f0aef
 2021-05-10 15:54:34 +00:00
Jorim Jaggi
5f6968d277 Merge "Correctly start tracing only where we are counting frames" into sc-dev 2021-05-10 15:37:28 +00:00
menghanli
208c172515 Apply dark theme for volume key shortcut warning dialog 
Bug: 186076332
Test: Manual testing
Change-Id: I602e19af16baa466c29bdd3fde21e5b14024c26a
 2021-05-10 11:19:16 +08:00
Jeff DeCew
8f30ae77ce Merge changes I7275175e,I4422c7e7 into sc-dev am: 21e2de2d4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14420504

Change-Id: If2d3540bd2455fdb04900e446523deb2caa54eba
 2021-05-07 15:46:29 +00:00
Jeff DeCew
21e2de2d4c Merge changes I7275175e,I4422c7e7 into sc-dev 
* changes:
  Small tweaks to improve messaging/conversation appearance.
  Correct the centering of the conversation avatars when badged
 2021-05-07 15:30:34 +00:00
Rubin Xu
af37a00f81 Merge "Remove unused isProfileActivePasswordSufficientForParent()" into sc-dev am: c4ac63a881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467997

Change-Id: I0d001af9a966844c56ba3d5148c78752b5d6bd1a
 2021-05-07 14:04:53 +00:00
Rubin Xu
f7a6c02cc8 Remove unused isProfileActivePasswordSufficientForParent() 
Bug: 182561862
Test: builds
Change-Id: I26d18113862c64c51333f62b81db65e335ccd18c
 2021-05-07 11:22:35 +01:00
Tiffany Nguyen
c555f1c996 Merge "Log the battery saver changed atom on initialization." 2021-05-07 04:18:53 +00:00
Jeff DeCew
61b8ed9853 Correct the centering of the conversation avatars when badged 
Fixes: 185593456
Test: visual
Change-Id: I4422c7e76cbb85f7a03bd69d53e38ef737dd80d6
 2021-05-06 10:39:50 -04:00
vichang
8ab2a20952 Merge "Copy StringPool to framework" am: ffe7986d71 am: 91a9308a30 am: f4b981eb46 am: 3a424f08d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684883

Change-Id: Ie8bdb2482daddfd725a4a5d40b0b6d7818f7ce8e
 2021-05-06 12:32:58 +00:00
vichang
3a424f08d8 Merge "Copy StringPool to framework" am: ffe7986d71 am: 91a9308a30 am: f4b981eb46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684883

Change-Id: I8b493a74501987931b04e8d7482ef07cd78bbafd
 2021-05-06 12:16:50 +00:00
vichang
f4b981eb46 Merge "Copy StringPool to framework" am: ffe7986d71 am: 91a9308a30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684883

Change-Id: I980dc82d702bc8ccd90ee1ec5ef7e125ab670931
 2021-05-06 12:00:11 +00:00
vichang
ffe7986d71 Merge "Copy StringPool to framework" 2021-05-06 11:16:09 +00:00
Nikita Iashchenko
4944a5b43c Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" am: 0a632252af am: 20cc15ed7b am: 5f84d097bc am: 32df2b1412 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691046

Change-Id: I4863ea5eb3a6ca04693182bccdf4d9ddbf913834
 2021-05-06 10:59:21 +00:00
Nikita Iashchenko
32df2b1412 Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" am: 0a632252af am: 20cc15ed7b am: 5f84d097bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691046

Change-Id: I02ca99ba10297d95dee04c0962b30a45ead40802
 2021-05-06 10:39:20 +00:00
Nikita Iashchenko
5f84d097bc Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" am: 0a632252af am: 20cc15ed7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691046

Change-Id: Ia809d1d0daba797ecf2d391622d6407a29e20a77
 2021-05-06 10:08:12 +00:00
Nikita Iashchenko
0a632252af Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" 2021-05-06 09:14:14 +00:00
TreeHugger Robot
74dfdf916a Merge "Use BinderDeathDispatcher for alarm listeners" into sc-dev am: 5d723faa14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14421803

Change-Id: I4221e24e6f3780e4bd4240e0fe748d574dc51de3
 2021-05-06 00:28:20 +00:00
Jing Ji
a63ead3123 Merge "Skip STATE_SERVICE_RESTARTING while dumping procstats to statsd" into sc-dev am: 90381205cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14433339

Change-Id: I90d4617bcbef6a326c268105020331b8208b30a1
 2021-05-06 00:27:55 +00:00
TreeHugger Robot
5d723faa14 Merge "Use BinderDeathDispatcher for alarm listeners" into sc-dev 2021-05-06 00:22:37 +00:00
Jing Ji
90381205cc Merge "Skip STATE_SERVICE_RESTARTING while dumping procstats to statsd" into sc-dev 2021-05-06 00:18:53 +00:00
Bill Lin
7415dd8d67 Merge changes from topic "ohm-shortcut" into sc-dev am: f94486117f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14295086

Change-Id: If4baab9a44c89d4af6ed362a73d589a3b064bb46
 2021-05-05 23:46:03 +00:00
Bill Lin
f94486117f Merge changes from topic "ohm-shortcut" into sc-dev 
* changes:
  3/ Listen ONE_HANDED_MODE_ACTIVATED for A11y shortcut action
  2/ Implement Shortcut for One Handed mode feature
 2021-05-05 23:43:12 +00:00
Suprabh Shukla
f25a518355 Use BinderDeathDispatcher for alarm listeners 
This ensures only one JNI strong reference for the death recipient when
the same binder is used for multiple linkToDeath calls.

Test: atest CtsAlarmManagerTestCases
atest FrameworksCoreTests:BinderDeathDispatcherTest
atest FrameworksMockingServicesTests:com.android.server.alarm

Fixes: 162961981
Bug: 182971683
Change-Id: Ieea2d8f4e495a4c4687378db9d0b8c6949a0406a
 2021-05-05 20:04:07 +00:00
Tom Natan
25bf625342 Merge "Add an API method for clearing compat overrides on release builds" am: b9680bac79 am: 9e9e1c4af5 am: 65654644bc am: 43bf4624ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688626

Change-Id: If0f4b50388f57b79ce42043678f283eb140923ec
 2021-05-05 16:46:27 +00:00
Tom Natan
43bf4624ec Merge "Add an API method for clearing compat overrides on release builds" am: b9680bac79 am: 9e9e1c4af5 am: 65654644bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688626

Change-Id: Id1b221629fee21648ee2a4683ab9a34b2efef1d6
 2021-05-05 16:41:16 +00:00
Tom Natan
65654644bc Merge "Add an API method for clearing compat overrides on release builds" am: b9680bac79 am: 9e9e1c4af5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688626

Change-Id: Ic1b9bb5b3f6cfba5192838020fc1b9770715f80a
 2021-05-05 16:13:03 +00:00
Tom Natan
b9680bac79 Merge "Add an API method for clearing compat overrides on release builds" 2021-05-05 14:58:41 +00:00
Siim Sammul
eb3d9321da Merge "Add sharding to Binder Latency collection and make it configurable. The hash code of the binder class will be used to select which apis will be collected for based on the configured modulo." into sc-dev am: f53378bd31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340803

Change-Id: I3b0870bd3c74b5f84945321003b12ee7ca14555f
 2021-05-05 09:54:23 +00:00
Siim Sammul
f53378bd31 Merge "Add sharding to Binder Latency collection and make it configurable. The hash code of the binder class will be used to select which apis will be collected for based on the configured modulo." into sc-dev 2021-05-05 09:30:57 +00:00
tomnatan
2697018f70 Add an API method for clearing compat overrides on release builds 
This will be useful when we want to clear overrides for apps that are no longer needed regardless of the version that is installed on device, e.g., when an app is being uninstalled, when we want to rollback an override, or when we deprecate a change-id.

In addition, rename CompatChanges#setPackageOverride to
addPackageOverrides.

Bug: 183183372
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Iff416c8b4c88b5eddc9e21c73219198d23266fa1
 2021-05-05 07:10:41 +00:00
Jing Ji
ec65308e4b Skip STATE_SERVICE_RESTARTING while dumping procstats to statsd 
Because it's not a real process state.

Bug: 186438656
Test: atest ProcStatsValidationTests
Test: atest ProcessStatsDumpsysTest
Test: atest CtsIncidentHostTestCases:ProcStatsProtoTest
Test: atest CtsStatsdHostTestCases
Test: atest CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: I26d170f5acac8434548aa62b439c26141ad99c3e
 2021-05-04 22:31:32 -07:00
Baligh Uddin
82df05f9a6 Merge "Remove annotations that have been relocated" into sc-dev 2021-05-04 20:28:32 +00:00
Tiffany Nguyen
d7ccc04b7f Log the battery saver changed atom on initialization. 
In order for the predicate to be read from the beginning, we need to
ensure the value has some initial state after device reboot
and after logging service starts up.

Bug: 175040249

Test: Manual
Change-Id: Id42f655f3fb42ef3e1ea0cf7bc7b2e536417de7d
 2021-05-04 06:52:19 +00:00
George Mount
930d7b4eb7 Remove edge effect type from the API. am: b1aee44bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14390423

Change-Id: If4f4c564adbcd2cc6d455f8224ad930cb6f07d4d
 2021-05-04 04:46:58 +00:00
Nader Jawad
d8f57c7cf3 Merge changes from topic "fling_after_pull" into sc-dev 
* changes:
  Allow EdgeEffect to fling during pull
  Remove edge effect type from the API.
 2021-05-04 04:41:04 +00:00
Dmitri Plotnikov
8caa905595 Merge "Use battery capacity estimates provided by Health HAL" into sc-dev am: 1d211e046e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14372226

Change-Id: Ic7aa7af6e61ce33a42833db108c415b582afa1fa
 2021-05-04 04:22:03 +00:00
Dmitri Plotnikov
f7faf95827 Merge "Remove SystemBatteryConsumer" into sc-dev am: acc4e1454e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14393698

Change-Id: I30985e6f846ac83335d353250e2e2b267f4118d9
 2021-05-04 02:49:11 +00:00
Dmitri Plotnikov
daa86f4f6a Use battery capacity estimates provided by Health HAL 
Bug: 186807039
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryChargeCalculatorTest
Change-Id: I4eb1606843ca1f2f2c0589e0abe6408f6be149c5
 2021-05-03 18:50:32 -07:00
Dmitri Plotnikov
acc4e1454e Merge "Remove SystemBatteryConsumer" into sc-dev 2021-05-04 01:47:34 +00:00
Dmitri Plotnikov
79e65de313 Remove SystemBatteryConsumer 
which has been superceded by AggegateBatteryConsumer

Bug: 186006876
Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: Use BatteryStatsViewer to verify that it's still functional
Change-Id: I2e4fe36ff310b6d68923fcecdfd22ce865b1f32d
 2021-05-03 16:03:39 -07:00
Sudheer Shanka
ff81c2f982 Merge "Include uid in batterystats logs." into sc-dev am: b1b9e93270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14409011

Change-Id: I50e10f58ab8a554310b15557adc542e554a44cf3
 2021-05-03 22:53:17 +00:00
George Mount
b1aee44bea Remove edge effect type from the API. 
Fixes: 186758538

Relnote: "Removes edge effect type from the API -- EdgeEffect now
supports only stretch edge effect for all applications."

Test: existing tests, modified to work with stretch
Change-Id: Iec7a9d4a0316ff3ba7297c4565bb881a1adcf949
 2021-05-03 22:45:10 +00:00
Sudheer Shanka
b1b9e93270 Merge "Include uid in batterystats logs." into sc-dev 2021-05-03 22:40:02 +00:00
Nikita Dubrovsky
5dd1d1490a Merge "Release drag-and-drop URI permissions on gc if not tied to an activity" into sc-dev am: f3c059b9f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344094

Change-Id: If433da500c2b48ccb3825c096920ccc0ce93fb42
 2021-05-03 22:15:07 +00:00