Commit Graph

71361 Commits

Author SHA1 Message Date
Ajay Panicker
3198ccf4e4 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev am: 73971b2a43
am: 8ddad99cd1

Change-Id: Id38a953fb7012af08dc28cfd28aeb2bcc6d2ba2e
2017-05-05 19:00:50 +00:00
Ajay Panicker
8ddad99cd1 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev
am: 73971b2a43

Change-Id: I899cf09b716c4b28c829f96e15760a897d45e293
2017-05-05 18:55:41 +00:00
Ajay Panicker
73971b2a43 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" into oc-dev 2017-05-05 18:45:17 +00:00
Abodunrinwa Toki
db8e72c5a8 Merge "TextClassifier: Remove debug logs." into oc-dev am: dc4fc1ebc2
am: 79c87bdf20

Change-Id: I6293ee9dbe6291b486ffd9b8fe01d1dcbe5cf96c
2017-05-05 18:01:37 +00:00
Abodunrinwa Toki
79c87bdf20 Merge "TextClassifier: Remove debug logs." into oc-dev
am: dc4fc1ebc2

Change-Id: Ie5d929f463a1917f4e9d4f83e32ba95f359d041a
2017-05-05 17:55:41 +00:00
TreeHugger Robot
dc4fc1ebc2 Merge "TextClassifier: Remove debug logs." into oc-dev 2017-05-05 17:49:43 +00:00
Bryce Lee
d36d46dd27 Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev am: 8cfb1a95da
am: fb19563972

Change-Id: I80322c13e9fb5926432ea660f0b143f9aa78e315
2017-05-05 16:10:51 +00:00
Neil Fuller
056156f616 Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

This contains a cherry-pick / conflict resolution of
commit 68f666693a after an automerger skip.
(cherry picked from commit 68f666693a)

Test: See above.
Bug: 31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-05 17:09:58 +01:00
Bryce Lee
fb19563972 Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev
am: 8cfb1a95da

Change-Id: I63d6a84c78f52d9ee20bdf719ac4edbca34fb44d
2017-05-05 15:54:41 +00:00
Todd Kennedy
d86841e7cd Merge "Don't set the failure extra on split install" into oc-dev am: d14e67656f
am: 9968f9aa27

Change-Id: I0d799cf7a9af9f3bad491aa58edc6f4aacae85bb
2017-05-05 15:53:18 +00:00
Todd Kennedy
7a6eafb7a9 Merge "Create auxiliary info for local instant apps" into oc-dev am: d55670bcf5
am: b21b3efc55

Change-Id: I3d656bbbb9610e9f4ea6e68fbd8a287e88ad6894
2017-05-05 15:52:01 +00:00
Bryce Lee
8cfb1a95da Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev 2017-05-05 15:46:37 +00:00
Bryce Lee
a1d8051fa2 Revert "Create auxiliary info for local instant apps"
This reverts commit e15e7cb592.

Change-Id: I116904fd8c2b28df7e03bc5ec2414ed67761b380
2017-05-05 15:38:44 +00:00
Tomasz Wasilczyk
8a3e865cf0 Merge "Dummy implementation get/setMute calls of ITuner." 2017-05-05 14:35:21 +00:00
Todd Kennedy
9968f9aa27 Merge "Don't set the failure extra on split install" into oc-dev
am: d14e67656f

Change-Id: I8c317e316b699d742db50b2b642f2d1b0304de57
2017-05-05 14:30:09 +00:00
Todd Kennedy
b21b3efc55 Merge "Create auxiliary info for local instant apps" into oc-dev
am: d55670bcf5

Change-Id: Ia0fe6ae25879711ae0c9cf92a71607a5d7c5f4dc
2017-05-05 14:27:55 +00:00
TreeHugger Robot
d14e67656f Merge "Don't set the failure extra on split install" into oc-dev 2017-05-05 14:21:18 +00:00
TreeHugger Robot
d55670bcf5 Merge "Create auxiliary info for local instant apps" into oc-dev 2017-05-05 14:20:51 +00:00
TreeHugger Robot
953dca4c27 Merge "Add (disabled) time zone update system server impl" 2017-05-05 12:21:34 +00:00
Vladislav Kuzkokov
0883dd5e14 Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev
am: 914d4bf10f

Change-Id: Ie0f943598965c23c7ec950bf851a055b355023ff
2017-05-05 09:40:34 +00:00
Vladislav Kuzkokov
914d4bf10f Merge "Store "block uninstall" flag separately from the rest of package state." into oc-dev 2017-05-05 09:36:51 +00:00
Dianne Hackborn
1391e2348b Merge "All kinds of little foreground services fixes." into oc-dev am: 525044e987
am: 596fc8b8d4

Change-Id: I79d7fc47855bdf0043d770b0a59a704260aa55e7
2017-05-05 09:13:24 +00:00
Dianne Hackborn
596fc8b8d4 Merge "All kinds of little foreground services fixes." into oc-dev
am: 525044e987

Change-Id: I5bd49a0e56bb5a5c08a20f38ce3801be1cb5dc1b
2017-05-05 09:06:34 +00:00
TreeHugger Robot
525044e987 Merge "All kinds of little foreground services fixes." into oc-dev 2017-05-05 09:00:47 +00:00
Dianne Hackborn
4ae51e09d8 All kinds of little foreground services fixes.
- Better explanations of some strings.
- Fix to use the right package when an item is pressed in
  the foreground services dialog.
- Improve java docs on Service.startForeground().

Bug: 37925387
    735566 lv - Android - [Source] Context unclear or missing:
    Apps running in background
Bug: 37925888
    735566 lv - Android - [Source] Context unclear or missing:
    Tap for details on battery and data usage
Bug: 37897953
    735566 gl - Android - [Source] Context unclear or missing:
    LEFT_SIDE, RIGHT_SIDE
Bug: 37943079
    Music is dying mid playback

Test: manual
Change-Id: Ied41932c61f59335bd18dfba3fcb13af28a0bddd
2017-05-04 23:31:33 -07: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
a71643e91c Bluetooth: Move Bluetooth battery stats tracking (1/2)
Move Bluetooth battery stats tracking to AppScanStats for a more
unified tracking system.

Bug: 37720787
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testBleScans
      Perform BLE scan and check battery stats
Change-Id: Ie6c682374e6e258c291d3a11eede649c7747ef40
2017-05-04 23:48:04 +00: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
Makoto Onuki
34ecd41de7 Merge "Fix frozen alarm issue" into oc-dev am: af4bfcdb7e
am: 7ff81553bd

Change-Id: Ibf7da2469f3158110a1d67e1234f949f8a577b00
2017-05-04 21:44:22 +00:00
Makoto Onuki
7ff81553bd Merge "Fix frozen alarm issue" into oc-dev
am: af4bfcdb7e

Change-Id: I2d35bfb3f2afec37ba3e26db4ca77df67ed43a7d
2017-05-04 21:22:17 +00:00
TreeHugger Robot
af4bfcdb7e Merge "Fix frozen alarm issue" into oc-dev 2017-05-04 21:12:39 +00:00
Siarhei Vishniakou
6a9ad74c29 Merge "Adding feature: input device disable/enable." 2017-05-04 18:51:27 +00:00
Neil Fuller
328532ab13 Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-04 19:28:49 +01:00
TreeHugger Robot
13dd75688d Merge "Fix checkstyle import ordering issues" 2017-05-04 17:51:28 +00:00
Ajay Panicker
4d71437598 Limit btsnoop file size (3/9)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
2017-05-04 09:56:50 -07:00
Neil Fuller
009e77a7bb Fix checkstyle import ordering issues
Fix checkstyle import ordering issues. These have been introduced
by various commits, all in goog/master.

This fixes the ordering before I land unrelated changes.

Commits:
640f30a776
782043caf8
35cda39422
a38fbf63fd

Bug: 37984816
Test: make -j30 droid
Change-Id: I158dcf38c024a294d38cdb40f8909d5d5113b199
2017-05-04 17:46:01 +01:00
Winson Chung
8125cba297 Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev am: c5e289d479
am: d7ea7c4010

Change-Id: Ie44af4d3ca2c64fcf53c7ecfc817d80ff6734a32
2017-05-04 16:26:47 +00:00
Winson Chung
d7ea7c4010 Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev
am: c5e289d479

Change-Id: I11edbc227141a31fddef985c7d94cc77ffb6ae80
2017-05-04 16:21:30 +00:00
Winson Chung
c5e289d479 Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev 2017-05-04 16:16:33 +00:00
Vladislav Kuzkokov
253984ed8c Store "block uninstall" flag separately from the rest of package state.
This allows to set "block uninstall" prior to installation and avoid the
inevitable race that happens when Device Policy app tries to force install and
then immediately block uninstall.

BUG=31043188
Test: Block com.chrome.beta in TestDPC. install, fail to uninstall through adb, unblock, uninstall

Change-Id: I5ffa2abcb003982eccfb77585c43b59532dd501d
(cherry picked from commit 1fff9dcb9d)
2017-05-04 15:54:08 +00:00
Makoto Onuki
a7d39cff96 Fix frozen alarm issue
Bug 34724174
Test: Manual test with "dumpsys alarm" + putting device into doze

Change-Id: I1d9ec3ac1e78ea263b2598a8c7ab4157ec40c535
2017-05-04 08:38:07 -07:00
Abodunrinwa Toki
1f07310a92 Merge "Only classify text when the toolbar is shown." into oc-dev am: a20b6ba1f2
am: 1b24ad6194

Change-Id: I0f12bda69956581e5cf8b0575b903133f34e03b1
2017-05-04 15:30:20 +00:00
Abodunrinwa Toki
1b24ad6194 Merge "Only classify text when the toolbar is shown." into oc-dev
am: a20b6ba1f2

Change-Id: I94619c59f052a170c3b40d8de25a5c6f7a71fa85
2017-05-04 15:24:23 +00:00
TreeHugger Robot
a20b6ba1f2 Merge "Only classify text when the toolbar is shown." into oc-dev 2017-05-04 15:15:34 +00:00
Tomasz Wasilczyk
9fa0287c18 Dummy implementation get/setMute calls of ITuner.
This is also not implemented in the native service.

Test: instrumentation
Bug: b/36863239
Change-Id: I2e5ceaec7a98eec0af6101a2f91dabd1cde2e090
2017-05-04 08:13:05 -07:00
Neil Fuller
102db03dab Merge "Time zone update API classes" into oc-dev-plus-aosp 2017-05-04 15:12:23 +00:00
Neil Fuller
d25a198c5a Merge "More time zone update API classes" am: c301339498 am: 9798dc47b1 am: 2cf4771469
am: aac434b431

Change-Id: I9d37119e5b6952bad07bcb99c9606b0c76516b30
2017-05-04 15:06:25 +00:00
Neil Fuller
aac434b431 Merge "More time zone update API classes" am: c301339498 am: 9798dc47b1
am: 2cf4771469

Change-Id: Ic82572f406fd56dd11afce108e14ff0dcb45557e
2017-05-04 14:59:58 +00:00
Neil Fuller
167b047385 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

This contains a cherry-pick / conflict resolution of
commit bede17c216 after an automerger skip.
(cherry picked from commit bede17c216)

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 15:58:40 +01:00