Commit Graph

8074 Commits

Author SHA1 Message Date
Wale Ogunwale
0f8ce259fb Merge "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb
am: 33c831a15c

Change-Id: Ib94d4d4e12cf6cfb7fc9e6c2a63b4d47b40223ca
2017-05-15 22:43:42 +00:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Wale Ogunwale
8f7bebca36 Changed alert window notifications to use single channel
Per UX request.

Change-Id: Iefe1be52743519af5ee1481b59613c87f16bdf7d
Fixes: 37422870
Test: Verify alert window notification channel.
2017-05-15 13:08:23 -07:00
Amith Yamasani
e726dbfa26 Merge "Map isolated processes to correct uid" into oc-dev am: ba4ac09d23
am: 5cd7bd118e

Change-Id: Ia3a64a6dd5ca85f1ab3346e75eab93e809bf1d5e
2017-05-15 17:54:57 +00:00
Amith Yamasani
5cd7bd118e Merge "Map isolated processes to correct uid" into oc-dev
am: ba4ac09d23

Change-Id: I44e106b59854a12d8f871cbf595574a4b345dd4a
2017-05-15 17:44:46 +00:00
Amith Yamasani
ba4ac09d23 Merge "Map isolated processes to correct uid" into oc-dev 2017-05-15 17:36:36 +00:00
Sumir Kataria
7f3ca9617a Merge "Use placeholderCount-1 if using default layout." into oc-dev am: 260d6c6e8c
am: 3912511db2

Change-Id: Iea16a4af5118e389814e63c828ed896a87e740c0
2017-05-15 16:51:41 +00:00
Sumir Kataria
3912511db2 Merge "Use placeholderCount-1 if using default layout." into oc-dev
am: 260d6c6e8c

Change-Id: Ie4ec53faee984a427e4e175255794a668e02b2a6
2017-05-15 16:45:57 +00:00
Sumir Kataria
260d6c6e8c Merge "Use placeholderCount-1 if using default layout." into oc-dev 2017-05-15 16:35:32 +00:00
Peeyush Agarwal
59817588f6 Fix broken MenuItem coretests
am: 101ab58e26

Change-Id: I5fa8da7c7455aa1e72924ea04d8e43580ed69765
2017-05-15 14:07:20 +00:00
Peeyush Agarwal
101ab58e26 Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS

Bug: 38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`

Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
(cherry picked from commit d70d2e6efc)
2017-05-15 13:56:59 +00:00
Paul Duffin
413d371991 Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp
am: e5573b54cb

Change-Id: I7c86684028d38f33e062a47ca92e7db2c6a6f3cf
2017-05-15 10:52:54 +00:00
Paul Duffin
e5573b54cb Merge "Moved c.a.i.u.Predicate[s] into legacy-test" into oc-dev-plus-aosp 2017-05-15 10:44:55 +00:00
TreeHugger Robot
e649ec3a98 Merge "Flag apps that have debugging set in systrace" 2017-05-13 00:45:42 +00:00
Amith Yamasani
8ee74aa3ba Map isolated processes to correct uid
This was missed in a recent addition to track cpu times at freq.

Bug: 34133340
Test: manual
Change-Id: Ie3720a76a1201c787601bb7419cb9eba47b2aa27
2017-05-12 17:30:12 -07:00
Selim Cinek
919615e60e Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev am: 0ac4b7d108
am: 02f135e8b2

Change-Id: I69fa213e97113508a002e75203871b2e1cf914aa
2017-05-13 00:08:56 +00:00
Selim Cinek
02f135e8b2 Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev
am: 0ac4b7d108

Change-Id: If9ece630645f4ebd3e1ee9e62ed2490d32e21082
2017-05-12 23:56:15 +00:00
Selim Cinek
0ac4b7d108 Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev 2017-05-12 23:42:49 +00:00
John Reck
62cc11996d Flag apps that have debugging set in systrace
Fixes: 36885723
Test: manual, ran systrace, verified only the app in #1
has the warning line and other (non-debuggable) apps
do not.

Change-Id: I244d28aeab352b524df4f1673654fdeb277d9f9c
2017-05-12 15:39:51 -07:00
Bookatz
664e902058 Merge "Batterystats BLE results counter takes in count" into oc-dev am: 80fc1af120
am: 78ae8e0436

Change-Id: Ia618e177af4d1e6f33c901be91a7109dc7615850
2017-05-12 22:08:05 +00:00
Bookatz
78ae8e0436 Merge "Batterystats BLE results counter takes in count" into oc-dev
am: 80fc1af120

Change-Id: I5b88079ab4bbefbc3e838e3ee8f90bfa961b0650
2017-05-12 22:02:10 +00:00
TreeHugger Robot
80fc1af120 Merge "Batterystats BLE results counter takes in count" into oc-dev 2017-05-12 21:57:18 +00:00
Sudheer Shanka
36310290a4 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev am: 5df9c5570e
am: 3ae1662024

Change-Id: I1954ae85025dabfebf452228b199cab07e892be2
2017-05-12 18:18:24 +00:00
Sudheer Shanka
3ae1662024 Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev
am: 5df9c5570e

Change-Id: Ia15bc54c61a692a37ad9b84a28643afc798b52c7
2017-05-12 18:09:36 +00:00
TreeHugger Robot
4075fd9c16 Merge "Fix broken MenuItem coretests" 2017-05-12 18:08:36 +00:00
Sudheer Shanka
5df9c5570e Merge "Add time spent by uid per cpu frequency to batterystats." into oc-dev 2017-05-12 18:02:43 +00:00
Selim Cinek
389edcd7c5 Fixed an issue where the media notification wouldn't have contrast
Because we were relying on the output to go in the right direction
already, this could be wrong. We're now only following the given
lightness direction if it is even possible to satisfy contrast.

Test: runtest -x core/tests/coretests/src/android/app/NotificationTest.java
Change-Id: I06d934a6b5c328ebbf0cf707030b0d707ccb5ab4
Fixes: 38182819
2017-05-12 10:06:41 -07:00
Bookatz
4ebc064c30 Batterystats BLE results counter takes in count
There would likely be too many BLE scan result calls for batterystats to
be healthy. Therefore, the caller can supply a count by which to increase the
counter, instead of doing it one result at a time.

Bug: 37720787
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: Ib8b2e8d250036be24c6c3dac477bc8d34fe498a6
2017-05-12 09:00:20 -07:00
Paul Duffin
f71d5b5b18 Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.

It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.

Keeps running the tests as part of the existing target.

At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.

Bug: 30188076
Test: make checkbuild
Change-Id: I6f6f5f16fe93bd80227a450c6254166632fc6813
2017-05-12 15:35:11 +01:00
Amin Shaikh
4657a8da6e Merge changes from topic 'onarevert' into oc-dev am: fa0b28220b
am: ef8d59b631

Change-Id: I6f3722c464609a49bed24824a35184080ae0b653
2017-05-12 08:56:58 +00:00
Adam Lesinski
6a59db8f6d Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev am: 120d7b219d
am: c041ea726c

Change-Id: I12dadc8e103e079daffa13773062382207e7fd84
2017-05-12 08:21:40 +00:00
Makoto Onuki
bf69e727e6 Merge "Make batterystats less chatty" into oc-dev am: 89d64cbbd9
am: 1186287a1e

Change-Id: I4d1b144837979bbcf212d3b647e3b8927c6c33bc
2017-05-12 08:10:07 +00:00
Amin Shaikh
ef8d59b631 Merge changes from topic 'onarevert' into oc-dev
am: fa0b28220b

Change-Id: I744b3dd5c4b58042e1460f161c2813f34784dc32
2017-05-12 06:46:27 +00:00
TreeHugger Robot
fa0b28220b Merge changes from topic 'onarevert' into oc-dev
* changes:
  Create a NotificationChannel for ONA.
  Revert "Delete old WifiNotificationController strings."
2017-05-12 04:40:26 +00:00
Adam Lesinski
c041ea726c Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am: 120d7b219d

Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7
2017-05-12 04:01:26 +00:00
Sudheer Shanka
9b735c5c1a Add time spent by uid per cpu frequency to batterystats.
Currently we have total user and system cpu time spent by the uid
in the batterystats. This change will add times spent by the uid
at each different cpu frequency to the batterystats dump which will
help in better understanding the battery usage.

Bug: 34133340
Test: manual
Change-Id: I567dc75875eb58543c0e71572d0b440e87dbb4b9
2017-05-11 20:56:46 -07:00
Makoto Onuki
1186287a1e Merge "Make batterystats less chatty" into oc-dev
am: 89d64cbbd9

Change-Id: Icc72768848756547c08eac7958b8e34a410dd6ba
2017-05-12 03:54:58 +00:00
TreeHugger Robot
120d7b219d Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev 2017-05-12 00:20:47 +00:00
TreeHugger Robot
89d64cbbd9 Merge "Make batterystats less chatty" into oc-dev 2017-05-12 00:15:56 +00:00
Sumir Kataria
db688af9d9 Use placeholderCount-1 if using default layout.
Bug: 37092598
Test: Updated ResolverActivityTest, Manual testing

Change-Id: I57ddd48c24830ac9a31a87013ca1d9b2e5714631
2017-05-11 13:07:46 -07:00
Adam Lesinski
61d2d37233 BatteryStats: Stop reading kernel memory stats when unvailable
Bug: 37689111
Test: manual
Change-Id: Ib14e4db14870a47da4f4d72bee613486fb976b78
2017-05-11 13:05:46 -07:00
Makoto Onuki
3f8e29715c Make batterystats less chatty
Fix 36869686
Test: manual

Change-Id: Ia5092222acd508e5539cd64ffe015a18036c9d83
2017-05-11 10:52:37 -07:00
Peeyush Agarwal
d70d2e6efc Fix broken MenuItem coretests
- Fix MenuItemImpl setShortcut bug caused when method signature was
changed after API review
- Remove outdated MenuItem coretests and move others to CTS

Bug: 38114634
Test: Run `cts-tradefed run cts-dev -m CtsViewTestCases -t
android.view.cts.MenuTest`

Change-Id: Iebb7e314cbb3f812fcfeb3f95797f1cf1bcfbae2
2017-05-11 14:33:51 +01:00
Adam Powell
5c3ddbd3e2 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev am: 33a030fa03
am: caf49bb507

Change-Id: I36e94e6f18a377e4fb92dd1d9f578e5685c29058
2017-05-11 07:11:14 +00:00
Adam Powell
caf49bb507 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev
am: 33a030fa03

Change-Id: Ica063156bc487bd10d2c8af1a7520b71c1c31a88
2017-05-11 02:52:20 +00:00
TreeHugger Robot
33a030fa03 Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev 2017-05-11 01:48:55 +00:00
Michael Wright
8036799d2e Enable Always On mode by default.
Also, add a config value for always on display availability.

Test: runtest -x tests/src/com/android/systemui/doze
Change-Id: Id5e0136a5bed0eac78ad48147b0bef8311b06986
2017-05-10 21:47:47 +01:00
Ahmed ElArabawy
2c01ffd14b Merge "power hal: Use power HAL API 1.1" 2017-05-10 20:37:48 +00:00
Adam Powell
08adbfed3a Lock out ResolverDrawerLayout dismissals during animations
Due to views being offset during the ChooserActivity animating in
direct share targets, it was possible to touch down on the sheet
attempting to tap, but have it be interpreted as a fling downward as
the relative touch position within the parent was moving. Lock the
dismiss gesture during animations to prevent this.

Bug: 36032762
Test: manual
Change-Id: I18b6f03148cbf402efc23e873262927e412ea7b7
2017-05-10 07:48:30 -07:00