Commit Graph

16171 Commits

Author SHA1 Message Date
TreeHugger Robot
ab367ab510 Merge "AttachedSurfaceControl: Respond to API feedback." into sc-dev 2021-05-11 19:13:05 +00:00
Marcin Oczeretko
af586a1465 Merge "Count the overall number of missed frames" into sc-dev 2021-05-11 09:09:40 +00:00
Winson Chung
d011237d39 Merge "Add test api to gc system and sysui" into sc-dev 2021-05-11 05:02:35 +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
Dmitri Plotnikov
7b32d78264 Merge "Convert BatteryStats.dumpLocked from BatteryStatsHelper to BatteryUsageStats" into sc-dev 2021-05-11 01:24:56 +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
Winson Chung
3d5b012471 Add test api to gc system and sysui
Bug: 186268407
Test: Presubmit
Test: adb shell cmd statusbar run-gc
Change-Id: Ie0567e1a75f6c991d226b5f90f1b126139b6be44
2021-05-10 13:13:06 -07: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
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
f7a6c02cc8 Remove unused isProfileActivePasswordSufficientForParent()
Bug: 182561862
Test: builds
Change-Id: I26d18113862c64c51333f62b81db65e335ccd18c
2021-05-07 11:22:35 +01:00
Charles Chen
71cb758286 Fix IME switch dialog crash on Dual rootDA display
The crash is because when the IME switch dialog created window token
is removed, it should switch back to listen to ImeContainer.
However, previous CL use the wrong API findAreaForToken, which only
finds the DisplayArea.Token under mAreaForLayer list.
In this scenario, we cannot find one because ImeContainer is moved to
its sub-RootDisplayArea.

This CL updates the naming and add more javaDoc to prevent from
confusion.

Test: atest WindowContextListenerControllerTests
Test: manual - repro steps in b/186366728#comment1
fixes: 186366728

Change-Id: I50d3247b0a158e83d09be893d31802d673a60697
2021-05-07 10:03:02 +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
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
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
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
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
Robert Carr
599f912e4e AttachedSurfaceControl: Respond to API feedback.
"Root" is eliminated from the interface name as it is a property
of the object and not the interface, but remains highlighted in the
getters to express the relationship between the called and returned
object.

Bug: 185365821
Test: Existing tests pass
Change-Id: I163fc23f2c37c984ef3ffeb7514c4d8c1c1a3f90
2021-05-05 14:28:25 -07: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
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
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
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
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
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
f3c059b9f0 Merge "Release drag-and-drop URI permissions on gc if not tied to an activity" into sc-dev 2021-05-03 21:53:10 +00:00
Dmitri Plotnikov
012689e349 Merge "Aggregate power data in AggregateBatteryConsumers" into sc-dev 2021-05-03 20:40:25 +00:00
Lucas Dupin
964a1715eb Merge "Color appearance model library" into sc-dev 2021-05-03 17:23:47 +00:00
Nikita Dubrovsky
f333d26f0d Release drag-and-drop URI permissions on gc if not tied to an activity
The implementation for drag-and-drop provides two ways of taking URI
permissions: a public API that ties permissions to an activity and
an internal API that grants "transient" permissions. The latter is
used in a single code path: dropping content into an editable
TextView (implemented in android.widget.Editor).

The transient code path was previously (Android R and below)
implemented using a try/finally block in Editor.onDrop. The change
I7ae38069fb741925211b42c7ff28784eb9722ce3 had updated that logic to
tie permissions to the app process lifecycle instead, to account for
the new OnReceiveContentListener which apps can use to implement
custom drop handling (and use a background thread to do the processing
of the content). The problem with having permissions tied to the app
process lifecycle is that the app process could potentially be
long-running.

This change updates the logic to tie transient permissions to the
DragAndDropPermissions object lifecycle (release whenever there are no
more reference to the object and it is garbage collected). This
follows the same approach as used for IME permission grants
(InputContentInfo.java and InputContentUriTokenHandler.java).

Bug: 181178998
Test: atest CtsWindowManagerDeviceTestCases:CrossAppDragAndDropTests
Test: Manually verified using development/samples/ReceiveContentDemo
Change-Id: I950d4572ee19af64da1ace1572fe12e17d09c609
2021-05-03 16:36:56 +00:00
Jorim Jaggi
9b0767564e Correctly start tracing only where we are counting frames
Test: Take  trace, do CUJ
Bug: 185902609
Change-Id: I17db03d290d0c1ab82b7969888f1d7c06575b5d0
2021-05-03 15:51:22 +02:00
Sudheer Shanka
b01bfadaa1 Include uid in batterystats logs.
Bug: 182272121
Test: n/a
Change-Id: Ic5cbc02b4d72c7dd5b916e9eb1954438cc81492f
2021-05-02 21:33:05 -07:00
Bill Lin
e6a20cb2ba 2/ Implement Shortcut for One Handed mode feature
- Define ONE_HANDED_COMPONENT_NAME
- Define one handed mode string
- Add one handed mode temp drawable
- Add ToggleAllowListingFeatureTarget for OHM
- Add ONE_HANDED_COMPONEMENT_NAME to featuresMap

Test: manual enable shortcut of one handed mode
Bug: 182425480

Change-Id: I5993cd8dbd3925efeebb9b75bb10d423c9a02601
2021-05-03 11:57:19 +08:00
Baligh Uddin
3b92756733 Remove annotations that have been relocated
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: TH
Merged-In: I024252070bd806d50d54377190fdc5cd5b4445e1
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
2021-05-01 18:56:12 +00:00
Baligh Uddin
800380ebd6 Remove annotations that have been relocated
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: TH
Merged-In: Ie6d4938961f7725cc141dd1a43f69a906b913f24
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
2021-05-01 18:33:15 +00:00
TreeHugger Robot
096c8547d3 Merge "Make IInputMethodManager#reportActivityViewAsync() truly async" into sc-dev 2021-05-01 07:51:21 +00:00
Winson Chiu
627cac02ad Merge changes Ie90dc390,Ia9513817 into sc-dev
* changes:
  Strip invalid domains in DVS#addPackage
  Move withPackageSettingsSnapshot methods into PackageManagerInternal
2021-04-30 21:24:05 +00:00
Florian Mayer
748c3a8040 Merge changes from topic "playprofileable" into sc-dev
* changes:
  Add packageInstaller to packages.list.
  Add profileable opt-out to packages.list.
2021-04-30 20:42:16 +00:00