Commit Graph

8017 Commits

Author SHA1 Message Date
Andreas Gampe
52fe51d8b0 Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9
am: 85c5e1c123

Change-Id: Id599b6c108b656932343209eb29abb3837b15624
2017-05-16 21:19:16 +00:00
Andreas Gampe
4c88a8c684 Zygote: Allow arbitrary-length wrap property names
The restriction on system property key length has been lifted.
Update the invoke-with code to first check the full-length property.
Then fall back to the truncated version for backwards-compatibility.

Test: m
Test: manual with long package name (Maps)
Change-Id: I9f714af093a6017307cfef18c84de769f0de7c3e
2017-05-15 19:51:29 -07: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
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
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
Paul Duffin
4455130610 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: Ia8502ec77ac11f85e078d70b68df214a9435eee7
Merged-In: I6f6f5f16fe93bd80227a450c6254166632fc6813
2017-05-15 15:17:48 +01: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
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
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
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
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
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
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
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
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
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
Hugo Benichi
7b96660a43 Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am: 1683224416 am: cd6537edb5
am: b323e61584

Change-Id: I0312882bb8885aaa65f99a445fd0554d6ac054b3
2017-05-10 09:20:04 +00:00
Hugo Benichi
f37b271894 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev 2017-05-10 08:19:57 +00:00
Android Build Merger (Role)
a4f91a277b Merge "Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev am: 62643dddc7" into oc-dev-plus-aosp 2017-05-10 00:47:20 +00:00
Adrian Roos
2e3ef5bdfd Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev
am: 62643dddc7

Change-Id: I7d7ae07607181559576d4dbd53ff7ef441c6ded3
2017-05-10 00:45:37 +00:00
Hugo Benichi
32a2d02a65 Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" am: ba666e0621 am: 76dc14ec88
am: 1697d48faf

Change-Id: I7dbfe3c96678e2325eb533f31523ad10d861ad02
2017-05-10 00:40:28 +00:00
TreeHugger Robot
62643dddc7 Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev 2017-05-10 00:32:38 +00:00
Hugo Benichi
ec07fbc9ed NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.

This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.

Test: added several new unit tests, based on synthetic data and real
      data also.
Bug: 33681750
Change-Id: I4867fe181938d94b5594b3d88896a3c4e01d895c
Merged-In: I2675643b220acbc6110179fa937d4c313b6f5e32

(cherry picked from commit e1bb3a14d1)
2017-05-10 09:19:12 +09:00
Hugo Benichi
00a16e077a NetworkStatsFactory: no double looping on stats + stacked interfaces
This patch uses the associative structure of the stacked/base interface
collection to avoid the two nested for loops over stacked/base
interfaces and all stats entries when correcting 464xlat traffic stats.

Consequently the list of stats entries is iterated only once.

Test: runtest -x frameworks/base/../NetworkStatsFactoryTest.java
Bug: 33681750
Change-Id: I84ae997fb693b909f431764697627b9957131732
2017-05-10 09:14:14 +09:00
Amin Shaikh
11176569e1 Create a NotificationChannel for ONA.
- Construct the NETWORK_AVAILABLE NotificationChannel in
SystemNotificationChannels

Bug: 37794067
Test: make
Change-Id: I27aa69f8d038af238343eabc706147a02cad7330
2017-05-09 14:15:14 -07:00
Adrian Roos
763256163a AOD: Disable not-yet-ready always-on feature
Fixes: 37982136
Test: Verify Ambient Display options are gone from SysuiTuner on userdebug builds
Merged-In: I0b20ba7c352bac7c278f659f0e29496cc342d381
Change-Id: Id61e5fa8f3c42ea17e6e878ec1c8a2555fe93320
2017-05-09 12:31:26 -07:00
Bookatz
eb5a068cbc Merge "Add BLE results counter to batterystats" into oc-dev
am: 7080fa5282

Change-Id: I8e485d5a97d46f6787b5b32c17ab5b85463f2653
2017-05-09 17:08:03 +00:00
TreeHugger Robot
7080fa5282 Merge "Add BLE results counter to batterystats" into oc-dev 2017-05-09 16:03:27 +00:00
Hugo Benichi
e1bb3a14d1 NetworkStatsFactory: fix double accounting on IPv6 only networks
For 464xlat scenarios on IPv6 networks, the clatd interface setup
introduces double counting of apps ipv4 traffic. NetworkStatsFactory was
accounting for this on the tx path, but not on the rx path. Also it did
not accounted for the 20 bytes added by the IPv6 header.

This patch subtract correctly the rx and tx traffic from the root uid on
the underlying interface, and also adds correctly the 20 bytes cost per
packet on the stacked interface for 464xlat traffic.

Test: added several new unit tests, based on synthetic data and real
      data also.
Bug: 33681750
Change-Id: I2675643b220acbc6110179fa937d4c313b6f5e32
2017-05-09 22:46:14 +09:00
Philip P. Moltmann
169989822e Merge changes I7c2c9411,Ibc72c84d,Ib3968644 into oc-dev
am: f512575c68

Change-Id: I590a658c92ad271c7b4f18f5768c1a4e581ffe94
2017-05-09 02:05:24 +00:00