Mohamed Heikal
7c7573040a
Fix bug where path shortening breaks ColorStateLists
...
Android resource loader uses the file path to check if a resource is a
ColorStateList. Path shortening removed that part of the path and thus
broke the resource loader of APKs optimized with path shortening. This
cl skips path shortening for resources under "res/color/"
Test: make aapt2_tests
Bug: b/75965637
Change-Id: If94dfa398efd81522d4faed157afd35f6dabe856
2019-04-26 10:48:54 -04:00
GyeHun Jeon
cad94f9695
Merge "[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)" into qt-dev am: 604e253c9e
...
am: 9f74f30165
2019-04-22 12:51:26 -07:00
zhouwenjie
870d110ef9
Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev am: 5c5e22e910
...
am: 661862d8e8
2019-04-22 12:43:24 -07:00
GyeHun Jeon
9f74f30165
Merge "[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)" into qt-dev
...
am: 604e253c9e
2019-04-22 12:41:04 -07:00
Yao Chen
9064c0a6c8
Merge "Fix a bug in ProtoFileReader." into qt-dev am: 28dd5f8486
...
am: 5751725c80
2019-04-22 12:14:27 -07:00
Robert Snoeberger
e681bba6d7
Merge "Don't slide down "At a Glance" when notifs aren't visible." into qt-dev am: de058b8e1b
...
am: 5f3d037663
2019-04-22 12:08:50 -07:00
Kweku Adams
dec18c80b4
Merge "Fix QuotaController job spam throttling." into qt-dev am: 95aeab0ac8
...
am: 947bac3817
2019-04-22 12:03:05 -07:00
zhouwenjie
661862d8e8
Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev
...
am: 5c5e22e910
2019-04-22 11:58:16 -07:00
Yao Chen
5751725c80
Merge "Fix a bug in ProtoFileReader." into qt-dev
...
am: 28dd5f8486
2019-04-22 11:52:40 -07:00
Robert Snoeberger
5f3d037663
Merge "Don't slide down "At a Glance" when notifs aren't visible." into qt-dev
...
am: de058b8e1b
2019-04-22 11:46:52 -07:00
TreeHugger Robot
604e253c9e
Merge "[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)" into qt-dev
2019-04-22 18:46:26 +00:00
Kweku Adams
947bac3817
Merge "Fix QuotaController job spam throttling." into qt-dev
...
am: 95aeab0ac8
2019-04-22 11:41:22 -07:00
TreeHugger Robot
5c5e22e910
Merge "Fix UID tracking in ProcessCpuTracker." into qt-dev
2019-04-22 18:35:27 +00:00
TreeHugger Robot
28dd5f8486
Merge "Fix a bug in ProtoFileReader." into qt-dev
2019-04-22 18:34:39 +00:00
Benedict Wong
39efd38d90
Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: 248cbf0025 am: 69a9326356
...
am: e1bf9b05e6
2019-04-22 11:32:21 -07:00
TreeHugger Robot
de058b8e1b
Merge "Don't slide down "At a Glance" when notifs aren't visible." into qt-dev
2019-04-22 18:26:37 +00:00
Kweku Adams
95aeab0ac8
Merge "Fix QuotaController job spam throttling." into qt-dev
2019-04-22 18:21:59 +00:00
Felipe Leme
a0544899f0
Merge "Minor javadoc fixes."
2019-04-22 18:21:07 +00:00
Lei Yu
a0c7a8527d
Merge "Remove feature flag slice injection" into qt-dev am: d7595947a8
...
am: f07ca42ca8
2019-04-22 11:19:15 -07:00
Benedict Wong
e1bf9b05e6
Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: 248cbf0025
...
am: 69a9326356
2019-04-22 11:18:52 -07:00
Lei Yu
f07ca42ca8
Merge "Remove feature flag slice injection" into qt-dev
...
am: d7595947a8
2019-04-22 11:09:38 -07:00
Benedict Wong
69a9326356
Merge "Add configurability of LinkProperties, meteredness for Test Networks"
...
am: 248cbf0025
2019-04-22 11:07:43 -07:00
Kweku Adams
7d6a31c154
Fix QuotaController job spam throttling.
...
QuotaController was inadvertently updating all Timers for a particular
user whenever any process state crossed the FOREGROUND_SERVICE
threshold, instead of only updating the Timer for the specific UID.
Also adding more data to QuotaController's dump to make future debugging
easier.
Bug: 129117282
Test: atest com.android.server.job.controllers.QuotaControllerTest
Test: atest CtsJobSchedulerTestCases
Change-Id: Ic8d9e6478e61cc62318ae5651f0526e41a71de8d
2019-04-22 11:06:15 -07:00
Winson Chung
bd6669c7de
Merge "Disconnect from overview service if process dies prior to connecting" into qt-dev am: 6d38898c1d
...
am: e7de9d5574
2019-04-22 10:56:48 -07:00
Lei Yu
d7595947a8
Merge "Remove feature flag slice injection" into qt-dev
2019-04-22 17:49:52 +00:00
Winson Chung
e7de9d5574
Merge "Disconnect from overview service if process dies prior to connecting" into qt-dev
...
am: 6d38898c1d
2019-04-22 10:42:58 -07:00
Andreas Gampe
418edab1fa
[automerger skipped] Merge "WmTests: Declare dependency on android.test.runner" into qt-dev am: 705ea2baa7
...
am: 96d79d6cb818f9c6c411
2019-04-22 10:41:56 -07:00
Benedict Wong
248cbf0025
Merge "Add configurability of LinkProperties, meteredness for Test Networks"
2019-04-22 17:41:20 +00:00
Andreas Gampe
96d79d6cb8
Merge "WmTests: Declare dependency on android.test.runner" into qt-dev
...
am: 705ea2baa7
2019-04-22 10:24:18 -07:00
Winson Chung
6d38898c1d
Merge "Disconnect from overview service if process dies prior to connecting" into qt-dev
2019-04-22 17:21:34 +00:00
Chris Craik
8b63380513
Merge "Enable am profiling for apps profileable by shell" into qt-dev am: 99f9d7c461
...
am: aba3db7dc5
2019-04-22 10:18:03 -07:00
TreeHugger Robot
705ea2baa7
Merge "WmTests: Declare dependency on android.test.runner" into qt-dev
2019-04-22 17:02:56 +00:00
Chris Craik
aba3db7dc5
Merge "Enable am profiling for apps profileable by shell" into qt-dev
...
am: 99f9d7c461
2019-04-22 09:54:59 -07:00
Todd Kennedy
3c798f2706
Merge "deprecate sharedUserId attribute" into qt-dev am: 21dd05fd2c
...
am: e6118a01f9
2019-04-22 09:53:51 -07:00
Todd Kennedy
e6118a01f9
Merge "deprecate sharedUserId attribute" into qt-dev
...
am: 21dd05fd2c
2019-04-22 09:44:16 -07:00
Anil Admal
5ef0fbefa0
Merge "Align GnssVisibilityControl location on/off with GnssLocationProvider" into qt-dev am: 0d5dacc4e6
...
am: 01ae92c4b8
2019-04-22 09:38:43 -07:00
Chris Craik
99f9d7c461
Merge "Enable am profiling for apps profileable by shell" into qt-dev
2019-04-22 16:37:53 +00:00
Julia Reynolds
af149c879e
Merge "Update clearData flow for notification settings" into qt-dev am: 39d59de13d
...
am: a1b42d26dc
2019-04-22 09:25:44 -07:00
TreeHugger Robot
21dd05fd2c
Merge "deprecate sharedUserId attribute" into qt-dev
2019-04-22 16:24:35 +00:00
Anil Admal
01ae92c4b8
Merge "Align GnssVisibilityControl location on/off with GnssLocationProvider" into qt-dev
...
am: 0d5dacc4e6
2019-04-22 09:23:13 -07:00
Julia Reynolds
a1b42d26dc
Merge "Update clearData flow for notification settings" into qt-dev
...
am: 39d59de13d
2019-04-22 09:15:40 -07:00
Felipe Leme
ca5e0a6e2f
Merge "Fixed content capture whitelist for specific activities."
2019-04-22 16:10:56 +00:00
Anil Admal
0d5dacc4e6
Merge "Align GnssVisibilityControl location on/off with GnssLocationProvider" into qt-dev
2019-04-22 15:57:47 +00:00
TreeHugger Robot
39d59de13d
Merge "Update clearData flow for notification settings" into qt-dev
2019-04-22 15:52:34 +00:00
WyattRiley
da7e74fbf0
Merge "Improve Location dump Timestamps" into qt-dev am: f4496e18e0
...
am: d951d0f8ff
2019-04-22 08:44:58 -07:00
Tim Van Patten
775b45e508
Merge "Verify Bundle is not null before using it" into qt-dev am: 5012f5bdce
...
am: 22a1c5fb44
2019-04-22 08:34:40 -07:00
GyeHun Jeon
61cac3a333
[wm] Fix smallestScreenWidthDp configuration on non default display (1/2)
...
smallestScreenWidthDp configuration should be set to smallest possible size.
This could cause unexpected resources to be loaded based on the incorrect configuration. So it
should be set as minimum size of screenWidthDp and screenHeightDp to account for rotation.
Test: reproduce test steps in bug
Test: atest CtsWindowManagerDeviceTestCases:DisplayTests
Bug: 129521230
Change-Id: I07403294e8fe6e6ad7aa718c8a5948aff4fafae1
(cherry picked from commit 7671d7042d60944813f36a03b74199c5a3d737ad)
2019-04-22 08:32:45 -07:00
WyattRiley
d951d0f8ff
Merge "Improve Location dump Timestamps" into qt-dev
...
am: f4496e18e0
2019-04-22 08:30:32 -07:00
Tim Van Patten
22a1c5fb44
Merge "Verify Bundle is not null before using it" into qt-dev
...
am: 5012f5bdce
2019-04-22 08:23:46 -07:00
TreeHugger Robot
f4496e18e0
Merge "Improve Location dump Timestamps" into qt-dev
2019-04-22 15:21:38 +00:00
