Commit Graph

436854 Commits

Author SHA1 Message Date
Derek Sollenberger
7bdc19bacb Merge "Isolate the graphics classes into their own static lib" 2019-07-31 17:43:57 +00:00
Jean-Michel Trivi
0cb4053e3b [automerger skipped] Merge "Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544 am: 0d30d34576" into qt-qpr1-dev-plus-aosp
am: 973efbe37a -s ours
am skip reason: subject contains skip directive

Change-Id: I81be9647f4468a02e6f68b2a2b41e3e7f17930bc
2019-07-31 10:32:31 -07:00
Android Build Merger (Role)
bb88fa48fe Merge "[automerger skipped] Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544 am: 119b77901c am: 4125a562fb -s ours am skip reason: subject contains skip directive" 2019-07-31 17:20:57 +00:00
TreeHugger Robot
5a83387c7e Merge "Fix return value for IActivityTaskManager#finishActivity()" 2019-07-31 17:20:51 +00:00
Jean-Michel Trivi
0e24d9a2c1 [automerger skipped] Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544 am: 119b77901c
am: 4125a562fb -s ours
am skip reason: subject contains skip directive

Change-Id: I978fa66c7f830276857a28b9298fa861b41da34b
2019-07-31 10:20:17 -07:00
Jean-Michel Trivi
729fdab3a1 [automerger skipped] Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: dd1882ec73" into qt-qpr1-dev-plus-aosp
am: cfc242659b -s ours
am skip reason: subject contains skip directive

Change-Id: I98c275c5789300f81928e59497d72af43826230a
2019-07-31 10:15:34 -07:00
Jean-Michel Trivi
3680ef3f82 [automerger skipped] [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: ea1ac92c63
am: b1b2fa126e -s ours
am skip reason: subject contains skip directive

Change-Id: Icd66c7f499c82bc328ea3ab7b57ee723f9788ac7
2019-07-31 10:08:39 -07:00
Android Build Merger (Role)
973efbe37a Merge "Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544 am: 0d30d34576" into qt-qpr1-dev-plus-aosp 2019-07-31 17:04:29 +00:00
Jean-Michel Trivi
73aec65ee2 Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544
am: 0d30d34576

Change-Id: Ia6c53256ed4bd2c223d11c79cce19ad6ef0f0a63
2019-07-31 10:03:55 -07:00
Jean-Michel Trivi
4125a562fb Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f96544
am: 119b77901c

Change-Id: I4294475e685fea912cf942da18d95a77dccb01eb
2019-07-31 10:02:11 -07:00
Android Build Merger (Role)
cfc242659b Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: dd1882ec73" into qt-qpr1-dev-plus-aosp 2019-07-31 16:56:23 +00:00
Jean-Michel Trivi
b1b2fa126e [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392
am: ea1ac92c63

Change-Id: I703ec65aef0c98d10a1a51691c8b219a1c70bf9d
2019-07-31 09:55:36 -07:00
Jean-Michel Trivi
d36ac1e562 [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392
am: dd1882ec73

Change-Id: I8ccc3e368675cfc763aa5274e0aa309422164a0b
2019-07-31 09:55:34 -07:00
Jean-Michel Trivi
0d30d34576 Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev
am: 11d2f96544

Change-Id: Ic426773bd4937efa815f3ab18e5fe06ec2999d0f
2019-07-31 09:45:23 -07:00
Jean-Michel Trivi
dd1882ec73 [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device
am: 8c92bde392

Change-Id: Idcc22099de1348d1a818be99131d63eb71377491
2019-07-31 09:45:20 -07:00
Jean-Michel Trivi
119b77901c Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev
am: 11d2f96544

Change-Id: I3504228a7d3783edd6f869dd0892a2bc05ee6fb0
2019-07-31 09:45:19 -07:00
Jean-Michel Trivi
ea1ac92c63 [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device
am: 8c92bde392

Change-Id: I3f24372ad92ce51bbf52498c54607c5a6d241f4e
2019-07-31 09:45:17 -07:00
TreeHugger Robot
207f99fd21 Merge "Fix x86 ABI in PinnerService" 2019-07-31 16:34:41 +00:00
TreeHugger Robot
11d2f96544 Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev 2019-07-31 16:06:28 +00:00
TreeHugger Robot
cf141432db Merge "Add logs for debugging IME onConfigurationChanged" 2019-07-31 13:42:14 +00:00
TreeHugger Robot
f7cb026386 Merge "Add a comment in WallpaperManager#getWallpaperColors" 2019-07-31 10:48:58 +00:00
Rubin Xu
a207c8a340 Merge "Use IndentingPrintWriter in DevicePolicyManager" 2019-07-31 09:35:46 +00:00
TreeHugger Robot
a6a28fd28f Merge "Deprecate TabHost and TabWidget" 2019-07-31 06:32:32 +00:00
TreeHugger Robot
6d5d39fa17 Merge "Import translations. DO NOT MERGE" 2019-07-31 04:54:28 +00:00
Bill Yi
84da80c307 Merge "Import translations. DO NOT MERGE" 2019-07-31 02:15:13 +00:00
Yan Wang
313328dcde Merge "startop: Refactor app running." 2019-07-31 01:55:33 +00:00
Christopher Tate
875161c6ba Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours am: ad9384ee97 -s ours am: 0fac2438a8 -s ours am: 73d03e3040 -s ours
am: 1668ed9a0d -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: I9109e300ab64d84498f1da9ab245280cb0814a75
2019-07-30 18:19:05 -07:00
Selim Cinek
bd00cdcbc3 Merge "Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9 am: 1b47b53c35" into qt-qpr1-dev-plus-aosp
am: ae53dd2988

Change-Id: I45612bcc3c17c560ebf52e267ee5624cb68efb39
2019-07-30 18:15:09 -07:00
Selim Cinek
1fc0115055 Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9 am: 92f3111d3f
am: d933d55dd6

Change-Id: I367dd353a6024016bbd7ba61275c9c65d2a971c9
2019-07-30 18:09:24 -07:00
Christopher Tate
1668ed9a0d Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours am: ad9384ee97 -s ours am: 0fac2438a8 -s ours
am: 73d03e3040 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: I5e2ded289222e2b3eebc5f0b0159278e5a085fa9
2019-07-30 18:04:56 -07:00
Android Build Merger (Role)
ae53dd2988 Merge "Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9 am: 1b47b53c35" into qt-qpr1-dev-plus-aosp 2019-07-31 00:58:59 +00:00
Selim Cinek
c895899676 Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9
am: 1b47b53c35

Change-Id: Ifb981d34c6a5f40f233f2b11298ede234d707382
2019-07-30 17:58:21 -07:00
Selim Cinek
d933d55dd6 Made the drag down anywhere on lockscreen go to the shade locked am: 5f1fb46ed9
am: 92f3111d3f

Change-Id: I22ff0f44d0d548a46d4d54f7c7cb0987e272f9cc
2019-07-30 17:58:13 -07:00
Selim Cinek
1b47b53c35 Made the drag down anywhere on lockscreen go to the shade locked
am: 5f1fb46ed9

Change-Id: Ic8b7f4ff2f73468142400e8d9b4b280780b769f0
2019-07-30 17:49:09 -07:00
Android Build Merger (Role)
73d03e3040 Merge "[automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours am: ad9384ee97 -s ours am: 0fac2438a8 -s ours am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history" into qt-r1-dev-plus-aosp 2019-07-31 00:48:52 +00:00
Christopher Tate
8802f101e3 [automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours am: ad9384ee97 -s ours
am: 0fac2438a8 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: I8003681eb772d66d7c32a5d0b13391ff05c77f47
2019-07-30 17:48:26 -07:00
Selim Cinek
92f3111d3f Made the drag down anywhere on lockscreen go to the shade locked
am: 5f1fb46ed9

Change-Id: I04d388ba3d74a225c44c2002148963cddbea1190
2019-07-30 17:48:10 -07:00
Christopher Tate
0fac2438a8 [automerger skipped] Merge "Fix job persistence & re-inflation" am: 83bb512502 -s ours
am: ad9384ee97 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: Id1098415941f1a4a318c8bf2b5d544cce333a0b7
2019-07-30 17:36:31 -07:00
Christopher Tate
ad9384ee97 [automerger skipped] Merge "Fix job persistence & re-inflation"
am: 83bb512502 -s ours
am skip reason: change_id Ia3ab1eb16aeaa85336409368b4340622cec19f4c with SHA1 7f6acc05db is in history

Change-Id: Iee32d7f21321441ff96d096c685bd120a9133f44
2019-07-30 17:14:58 -07:00
Colin Cross
17699e99ed [automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours am: 122f77dbac -s ours am: 649965cdc5 -s ours am: 66d11c2a7e -s ours
am: 5567fc42b7 -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: I98bbc92a080766fe4c8987da74a764778c0d72f6
2019-07-30 16:54:48 -07:00
Treehugger Robot
83bb512502 Merge "Fix job persistence & re-inflation" 2019-07-30 23:39:04 +00:00
Jean-Michel Trivi
8c92bde392 [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device
Due to the expected BECOMING_NOISY behavior associated
with a device disconnection, the disconnection is handled
asynchronously after a fixed delay. This delay caused an
inversion of commands in the processing order of the
disconnection of a device closely followed by connection
of the same device.
 The fix consists in:
- overriding the equals() operator for BtDeviceConnectionInfo
 so messages for a given device in the message queue
 can be checked / removed.
- when AudioDeviceBroker receives a command for A2DP
 connection or disconnection, remove all upcoming connection
 and disconnection commands in the queue for this device
 (see postBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent)
- remove AudioDeviceBroker.handleSetA2dpSinkConnectionState, which
 was only used in BtHelper.onA2dpProfileConnected() with
 a CONNECTED state, and have this method perform a regular device
 connection (just like when coming from AM->AS).
- in AudioDeviceInventory.onSetA2dpSinkConnectionState(), support
 receiving a connection event for an already connected device,
 to support codec changes.

This change also includes modifications to the classes involved
in the device connection to make them support mocking/spying
to reproduce the bug conditions (see AudioDeviceBrokerTest).

Bug: 134932649
Test: atest AudioDeviceBrokerTest
Change-Id: If2b3b41409c77467a181a2f9b42310db9b9de8c5
2019-07-30 23:19:35 +00:00
Colin Cross
5567fc42b7 [automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours am: 122f77dbac -s ours am: 649965cdc5 -s ours
am: 66d11c2a7e -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Ia2032d4f125fb0ce6bbe0e6c74079e27a9447bd3
2019-07-30 16:15:25 -07:00
Andrii Kulian
40eda675f3 Fix return value for IActivityTaskManager#finishActivity()
IActivityTaskManager#finishActivity() used to return 'true' even if
activity was already finishing prior to the call. The refactor in
I30ebc306637dea5e8b28ca4b4dfaab8df31d2be3 that merged
ActivityStack#requestFinishActivityLocked() and
ActivityRecord#finishActivityLocked() accidentally changed the
return value for the case when activity was already finishing.

This made the client think that the activity was not finished, so
the client state was not updated correctly.

This CL checks the finishing state of the activity instead to report
back to client.

Bug: 138265285
Test: atest WmTests:ActivityTaskManagerServiceTests
Change-Id: I9503cf6b9ceaece4ab6a5933c143d238f7fa7c4d
2019-07-30 16:12:38 -07:00
Colin Cross
66d11c2a7e [automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours am: 122f77dbac -s ours
am: 649965cdc5 -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Id47bb7c3b015b0165596864217aabc76de3195de
2019-07-30 15:58:49 -07:00
Yan Wang
06f54882c0 startop: Refactor app running.
Collecting and app running share lots of common code.
Create a new class to run app and allow callbacks to specify
preprocess and postprocess and metrics selection.

Test: pytest run_app_with_prefetch_test.py
Test: pytest app_runner_test.py
Bug: 138233615
Change-Id: I972c82fb9ff3a0f6cc7661bc3dc47b342716c26c
2019-07-30 15:55:18 -07:00
Colin Cross
649965cdc5 [automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours
am: 122f77dbac -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Iea341166db1a792cd297c8e49b323401d45ee577
2019-07-30 15:43:44 -07:00
Colin Cross
122f77dbac [automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp"
am: 25fff4828a -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Id32923bd0cc23787a4ca841ddfc7e6bc96351548
2019-07-30 15:22:12 -07:00
Christopher Tate
ef7eef60c9 Fix job persistence & re-inflation
We were persisting jobs' battery-not-low constraints but were not
properly restoring that constraint when the job was inflated at boot.
This could result in a runtime bootloop (!) if the job had no other
constraints, requiring a factory reset to restore the device to
usability.

We now:

* properly inflate the battery-not-low constraint;
* persist & inflate the storage-not-low constraint, which previously was
being stripped entirely and could result in a similar crash-at-boot;
* ignore the job rather than crash the system if one is inflated into
a non-viable state; and
* formally test previously-untested constraint persistence

Bug: 130012063
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java
Test: atest CtsJobSchedulerTestCases
Test: JobStoreTest with forced throw in JobInfo.Builder#build()
Change-Id: Ia3ab1eb16aeaa85336409368b4340622cec19f4c
Merged-In: Ia3ab1eb16aeaa85336409368b4340622cec19f4c
2019-07-30 15:18:02 -07:00
Andreas Gampe
90207363d5 Merge "BGDexopt: Clean up ordering" am: 33ac5052c9 am: 1404b89b43 am: 7ef319f439 am: 8797ddb50d
am: 6d90dcccfd

Change-Id: I5d073604a932b77dd13ce47bc3f5b5f909f039b0
2019-07-30 15:04:00 -07:00