Commit Graph

1973 Commits

Author SHA1 Message Date
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
Bryan Mawhinney
a94ceb8b24 Merge "Re-Re-enable SettingsBackupTest" into oc-dev am: 731c41950a
am: 3df94ce03e

Change-Id: I9d4e61a960d0b80d7cd83599b8a501e382c97542
2017-05-12 14:37:32 +00:00
Bryan Mawhinney
3df94ce03e Merge "Re-Re-enable SettingsBackupTest" into oc-dev
am: 731c41950a

Change-Id: I1cae217a9a0fe3dc6a86e1c6da3eb54b11f55968
2017-05-12 14:30:24 +00:00
TreeHugger Robot
731c41950a Merge "Re-Re-enable SettingsBackupTest" into oc-dev 2017-05-12 14:25:05 +00:00
Aurimas Liutikas
28af8cbabc Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev am: cd32b42e1c
am: 85934c2855

Change-Id: I6838576d68ba9781662e3bb7b271e9d9bf52fffe
2017-05-12 07:40:00 +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
Aurimas Liutikas
85934c2855 Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
am: cd32b42e1c

Change-Id: I357809d19e5ae3f51ae11693675899e45f79152b
2017-05-12 03:47:09 +00:00
Aurimas Liutikas
6b771ce3c3 Suppress AppCacheTest tests that cause am instrument failure.
These tests runs a command to clear application data and by
doing so causes the application that is being instrumented
to restart, which in turn "am instrument' thinks is an app
crash, thus aborting the rest of the tests.

Bug: 38238448
Change-Id: Ida69b828a9950a83d790a3a7628e32c14a04a772
Test: bit FrameworksCoreTests:android.content.pm.AppCacheTest
2017-05-11 21:32:31 +00: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
Bryan Mawhinney
20924840ab Re-Re-enable SettingsBackupTest
After fixing blacklists.

Bug: 37684646
Test: runtest --path core/tests/coretests/src/android/provider/SettingsBackupTest.java
Change-Id: Ib3c93e65dd742009a8c3ef63d628d2748c9e840b
2017-05-11 13:29:30 +01:00
Aurimas Liutikas
713a5901e4 Merge "Merge "Fix broken android.view.DisabledTest." into oc-dev am: d5d4ffebdd" into oc-dev-plus-aosp
am: 407a36cb38

Change-Id: I666e18c2e1ddb559a1887176eed85585542eb1e8
2017-05-10 02:44:58 +00:00
Aurimas Liutikas
a71b6850c3 Merge "Fix broken android.view.DisabledTest." into oc-dev
am: d5d4ffebdd

Change-Id: I968352866d021c4b188a841969c7133246a143ce
2017-05-10 01:58:27 +00:00
Aurimas Liutikas
54e221a4df Fix broken android.view.DisabledTest.
The test was calling setOnClickListener off the main thread.

Test: ran manually and it now passes
Bug: 38166715
Change-Id: I63777467a789c6a060b340d6b410ac2e744db678
2017-05-09 11:57:07 -07:00
Bookatz
8b46904e73 Merge "Add BLE results counter to batterystats" into oc-dev am: 7080fa5282
am: eb5a068cbc

Change-Id: I2e3bb04a7283d9aa64181e221462cff7b40839af
2017-05-09 17:48:49 +00: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
TreeHugger Robot
5c4f60a06b Merge "Fix cannot share text from twitter to managed profile" 2017-05-09 15:23:21 +00:00
TreeHugger Robot
74fe2cbc3a Merge "Move some NetworkStats tests to tests/net." into oc-dev 2017-05-09 06:36:39 +00:00
Andrei Stingaceanu
f184398730 Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev am: 2880a4b41f
am: 1fadfb0765

Change-Id: If8e0edfd2f1e1aeaa0831863fb2cd6b83a252083
2017-05-08 13:34:17 +00:00
Andrei Stingaceanu
1fadfb0765 Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev
am: 2880a4b41f

Change-Id: I1c114c411d97aba08ecfb390c28ceb18eee4cbbd
2017-05-08 13:28:16 +00:00
TreeHugger Robot
2880a4b41f Merge "Fix broken Backspace/ForwardDelete tests" into oc-dev 2017-05-08 13:21:34 +00:00
Lorenzo Colitti
c87ec500e3 Move some NetworkStats tests to tests/net.
This groups them together with the rest of the networking unit
tests. It also speeds up compile/test cycles ("runtest -x" of one
file goes from 1m15s to 30s).

Bug: 33681750
Test: runtest frameworks-net passes on internal tree
Merged-In: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd
Change-Id: I5ae5dbf74c94feb0fe3759681e5e6d6fba62fa32

(cherry picked from commit c86013be93)
2017-05-08 08:38:08 +00:00
Abodunrinwa Toki
fc9b396c10 Merge "Reject smart selection if outside original selection." into oc-dev am: 6dcae2b91f
am: 4aeea2404c

Change-Id: I2ef8f172023446def205cfd0b3e6384ab12fee7a
2017-05-05 20:41:59 +00:00
Abodunrinwa Toki
4aeea2404c Merge "Reject smart selection if outside original selection." into oc-dev
am: 6dcae2b91f

Change-Id: I34bd3e3833d5d7cd52264a5aa34bee18c51bb095
2017-05-05 20:35:04 +00:00
TreeHugger Robot
6dcae2b91f Merge "Reject smart selection if outside original selection." into oc-dev 2017-05-05 20:29:33 +00:00
Seigo Nonaka
c7b291aad6 Merge "Resolve styles by font table if not specified." into oc-dev am: 1ea3a2600b
am: c000acd771

Change-Id: I7dc5268ddea18dfda560742b370388860dd87344
2017-05-05 19:15:24 +00:00
Seigo Nonaka
c000acd771 Merge "Resolve styles by font table if not specified." into oc-dev
am: 1ea3a2600b

Change-Id: I8c99a582e4453ec0dfbe6e30650b6682f68e255a
2017-05-05 19:05:18 +00:00
TreeHugger Robot
1ea3a2600b Merge "Resolve styles by font table if not specified." into oc-dev 2017-05-05 18:51:25 +00:00
Wei Wang
2ad33a3f1e Merge "Add wifi throttling to backup blacklist." into oc-dev am: 2cd2d23440
am: ff910928dc

Change-Id: I96f88ffe9e8335b6a95f8fff70853c9334227305
2017-05-05 17:33:43 +00:00
Wei Wang
ff910928dc Merge "Add wifi throttling to backup blacklist." into oc-dev
am: 2cd2d23440

Change-Id: Ibfa48a05769784cf688e5b35695c3a8369ac263c
2017-05-05 17:23:35 +00:00
TreeHugger Robot
2cd2d23440 Merge "Add wifi throttling to backup blacklist." into oc-dev 2017-05-05 17:15:53 +00:00
Abodunrinwa Toki
b416297433 Reject smart selection if outside original selection.
- The aim is to be defensive and prefer to reject a selection if
  it is likely to be wrong.

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 38019270
Change-Id: I35ebc84fb102373949366296434a31d899edfef3
2017-05-05 18:07:17 +01:00
Geoffrey Pitsch
d84319e0c6 Merge "Fix settings test for show_notification_channel_warnings" into oc-dev am: 2d2689add7
am: 43a5185a43

Change-Id: I2037766561cc7f590daa1f6a58482e7c5bd189f4
2017-05-05 16:52:15 +00:00
Geoffrey Pitsch
43a5185a43 Merge "Fix settings test for show_notification_channel_warnings" into oc-dev
am: 2d2689add7

Change-Id: Iac6657120054846aafff07b2335b631e350a7445
2017-05-05 16:36:21 +00:00
Seigo Nonaka
a5fa9e8a63 Resolve styles by font table if not specified.
android:fontStyle and android:fontWeight is an optional attribute.
If they are missing, we are using non-italic 400 weight, but this is
not good idea. We should resolve these style value from font metadata.

Bug: 37988154
Test: am instrument -w -e class android.content.res.cts.ResourcesTest
      android.content.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I80a436cd3632d8c58fa3d8bdaedac73b95f61a8c
2017-05-05 09:30:34 -07:00
TreeHugger Robot
2d2689add7 Merge "Fix settings test for show_notification_channel_warnings" into oc-dev 2017-05-05 16:20:58 +00:00
Andrei Stingaceanu
869dd39c5a Fix broken Backspace/ForwardDelete tests
* correctly use @Before to intstantiate
* get rid of useless KeyListenerTestCase class
* move to KeyUtils, refactor and document util method to generate
  a KeyEvent

Bug: 37991689
Test: adb shell am instrument -w -e package android.text.method
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ibbce351f31eb62492cd1c7c920fdef44df89b683
2017-05-05 15:43:52 +01:00
Philip P. Moltmann
f1f74a60d4 Merge "autofill service search uri is not backed up" into oc-dev am: 919076aa2a
am: 604fac591d

Change-Id: I160f14d16f9def7babe659aa60bff5af71f32f79
2017-05-05 01:42:22 +00:00
Philip P. Moltmann
604fac591d Merge "autofill service search uri is not backed up" into oc-dev
am: 919076aa2a

Change-Id: Ifc93582b3549df369d7f22536f53edd417623b5a
2017-05-05 01:30:35 +00:00
Philip P. Moltmann
919076aa2a Merge "autofill service search uri is not backed up" into oc-dev 2017-05-05 01:22:19 +00:00
Ajay Panicker
0a3411a29b resolve merge conflicts of 06b8324d02 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I29b117df6803fd59faafe97a02b8ab2d34741f0e
2017-05-04 17:12:27 -07:00
Ajay Panicker
06b8324d02 Merge "Limit btsnoop file size (3/9)" into oc-dev
am: 4d1fb218f4

Change-Id: I587722c6408067b45331f10a7bfbb55c53c6317f
2017-05-04 23:22:30 +00:00
Ajay Panicker
4d1fb218f4 Merge "Limit btsnoop file size (3/9)" into oc-dev 2017-05-04 22:56:21 +00:00
Wei Wang
3b7528be11 Add wifi throttling to backup blacklist.
Test: Ran SettingsBackupTest test.

Bug: 37684646

Change-Id: I3cd2e30fc6736f36b8569400941a3128e06d2f48
2017-05-04 14:04:52 -07:00
Geoffrey Pitsch
bd3ec6abf5 Fix settings test for show_notification_channel_warnings
Test: runtest --path
core/tests/coretests/src/android/provider/SettingsBackupTesst.jav
Bug: 37684646

Change-Id: I77ff42107979b22ca2d4b81a406fc69a5b16417f
2017-05-04 14:56:33 -04:00
Philip P. Moltmann
e287a152cc autofill service search uri is not backed up
This is expected as the settings is set by the app market of the device
each time the marked it set up.

Bug: 37684646
Test:  mmma -j40 frameworks/base/core/tests/coretests &&
       adb install -r ${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk &&
       adb shell am instrument -w -e class android.provider.SettingsBackupTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ie9502150d0861173ab58ed7d096d3900704b8915
2017-05-04 11:07:05 -07:00
Tony Mak
96d78f5f62 Fix cannot share text from twitter to managed profile
Cross profile intent must be implicit, we should also clear the package
and component of the inner intent in chooser intent.

Test: bit FrameworksCoreTests:com.android.internal.app.IntentForwarderActivityTest
Test: can share tweet to work profile
Test: can share web link from personal to work profile and vice versa

Fix: 37767313

Change-Id: I7cbea3525def0ff029d9b5c2953117b4cab6f28b
2017-05-04 18:12:24 +01:00