Commit Graph

16711 Commits

Author SHA1 Message Date
Dianne Hackborn
46c91418e9 Merge "More small fixes/adjustments to job scheduler." into oc-dev
am: 950fa06a29

Change-Id: I3a59cfcb955b33276f514c2d3086501a413733a7
2017-04-18 00:58:27 +00:00
Sungsoo Lim
0432fd9aa5 Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev
am: ab16ea9094

Change-Id: I84277311c9215c23ecb02ccef90a54e89d921cb4
2017-04-18 00:53:14 +00:00
TreeHugger Robot
950fa06a29 Merge "More small fixes/adjustments to job scheduler." into oc-dev 2017-04-18 00:47:09 +00:00
Sungsoo Lim
a8647cb547 Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
am: a44d7cd25b

Change-Id: I0831739bd0eb7317ea69adc7569d86e11a1f9fb3
2017-04-18 00:46:57 +00:00
Sungsoo Lim
09c3bdd1db Merge "MediaBrowser: Revert Search API" into oc-dev
am: 51d91bff17

Change-Id: I0ec694cdbf24bd6e9dbacb22b93b4b644c3f524d
2017-04-18 00:37:33 +00:00
Sungsoo Lim
ab16ea9094 Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev 2017-04-18 00:32:58 +00:00
Sungsoo Lim
a44d7cd25b Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev 2017-04-18 00:31:35 +00:00
Sungsoo Lim
51d91bff17 Merge "MediaBrowser: Revert Search API" into oc-dev 2017-04-18 00:26:26 +00:00
Jeff Sharkey
aead06b971 Merge "Storage API polishing." into oc-dev
am: 200d72d933

Change-Id: I1ad134599ee095628dcc7fe1da28bda40a1863f4
2017-04-17 22:39:20 +00:00
Dianne Hackborn
fd8807accf More small fixes/adjustments to job scheduler.
- JobServiceEngine now takes a concrete Service instead of
generic Context in its constructor, since it really must be
associated with a real Service.

- Expand documentation of how dequeueWork() operates.

- Fix some job scheduler implementation to hopefully actually
match the docs: transfer remaining executing work to the new
job, and actually correctly transfer state from old and new
jobs if we are rescheduling due to a true return from onStopJob().

Test: bit CtsJobSchedulerTestCases:*
Change-Id: Ia66797049883eefb566264f930070afb69d469b1
2017-04-17 15:31:15 -07:00
Jeff Sharkey
200d72d933 Merge "Storage API polishing." into oc-dev 2017-04-17 22:26:44 +00:00
Julia Reynolds
c04cb25cdb Merge "Add user to channel/group modification callbacks." into oc-dev
am: 1ed2771450

Change-Id: I3ff8b4f15fe7b3d22ef243e3f5379dd3d136a0f7
2017-04-17 21:40:09 +00:00
TreeHugger Robot
1ed2771450 Merge "Add user to channel/group modification callbacks." into oc-dev 2017-04-17 21:26:54 +00:00
Todd Lee
4dbe8216ac Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
am: c025ea892e

Change-Id: Ifb690a1ac7d9ff2605c88bd4503e06311ef0dd1c
2017-04-17 21:12:59 +00:00
TreeHugger Robot
c025ea892e Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev 2017-04-17 21:02:48 +00:00
Philip P. Moltmann
88a9bd73bb Merge "Allow to finish session when all views are gone" into oc-dev
am: 3440e92009

Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f
2017-04-17 21:00:28 +00:00
Makoto Onuki
9381a4542d Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am: c3fa6ab2ac

Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e
2017-04-17 20:46:36 +00:00
TreeHugger Robot
3440e92009 Merge "Allow to finish session when all views are gone" into oc-dev 2017-04-17 20:45:05 +00:00
Jordan Liu
728fbfb7c1 Merge "Update api for ServiceStateProvider" into oc-dev 2017-04-17 20:37:32 +00:00
TreeHugger Robot
c3fa6ab2ac Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev 2017-04-17 20:36:00 +00:00
Aurimas Liutikas
a49fb70e5f Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
am: ff4e132cff

Change-Id: I72249172933a83c91c175dd46c96823368a25bda
2017-04-17 20:21:25 +00:00
TreeHugger Robot
ff4e132cff Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev 2017-04-17 20:15:22 +00:00
Joe LaPenna
feb382e926 Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
am: 5b06dbd12b

Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf
2017-04-17 19:08:19 +00:00
TreeHugger Robot
5b06dbd12b Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev 2017-04-17 19:03:03 +00:00
Jordan Liu
e08f67f2ad Merge "Update api for ServiceStateProvider" am: 286b5f117d am: ea4a67ddd1
am: 56a13d1bce

Change-Id: I8797fca65daa01ad86118b5f548a800e1854769c
2017-04-17 18:44:01 +00:00
Jeff Sharkey
789a8fc792 Storage API polishing.
Based on API council feedback, switch to using real UUID objects
instead of Strings.  Since UUID is a general-purpose utility class
that will be passed around quite a bit, add it to Parcel and Bundle.

Define well-known namespaced UUID values for "default" and "primary
physical" storage devices, which will let us annotate a bunch of
things with @NonNull.

Define new extras for MANAGE_STORAGE intent that apps can use to
signal where and how much space they'd like the user to free up.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I8421b126d680f69141a361c1e77223fe2bf4a325
2017-04-17 12:19:50 -06:00
Jordan Liu
b9b75edb2d Update api for ServiceStateProvider
ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896
2017-04-17 11:07:31 -07:00
Treehugger Robot
286b5f117d Merge "Update api for ServiceStateProvider" 2017-04-17 18:05:04 +00:00
Tyler Gunn
790ec07c26 Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev 2017-04-17 17:40:50 +00:00
Tyler Gunn
346892ff9f DO NOT MERGE Expose phone account register/unregister intents.
These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
(cherry picked from commit d9da6ce993)
2017-04-17 17:39:22 +00:00
Hangyu Kuang
bde6da6f18 Merge "media: Address API review comments" into oc-dev
am: ab312729ce

Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe
2017-04-17 17:13:17 +00:00
Hangyu Kuang
ab312729ce Merge "media: Address API review comments" into oc-dev 2017-04-17 17:04:28 +00:00
Aurimas Liutikas
ba590a694b Enhance Chronometer to better support Swedish countdowns.
Adds a method isTheFinalCountDown that allows to correctly
determine whether it is the final countdown.

Test: None
Change-Id: I786ae3455479bac25ccf25efba1c3dce18185117
2017-04-17 09:27:09 -07:00
Julia Reynolds
211d99d1b9 Merge "Remove @removed method" into oc-dev
am: bbcf5fba1c

Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
2017-04-17 15:09:24 +00:00
TreeHugger Robot
bbcf5fba1c Merge "Remove @removed method" into oc-dev 2017-04-17 15:01:54 +00:00
Todd Kennedy
8d0dacb5b1 Merge "expose the instant app installer component" into oc-dev
am: 676590d060

Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060 Merge "expose the instant app installer component" into oc-dev 2017-04-17 14:17:27 +00:00
Todd Lee
ea2f3be7aa OEM single-build/multi-SKU via dynamic RRO support
The purpose here is to provide support for selectively
enabling Runtime Resource Overlays (RROs) (specifically
those pertaining to a specific SKU, within a OEM's "single
build" covering multiple SKUs) at boot based on the value
of a pre-defined system property.

This mechanism is designed to be compatible with other,
recent changes to Runtime Resource Overlays - specifically:

- has no effect on 'isStatic'. Resource overlays must be
  attributed as static in order to qualify for loading into
  the system_server. The 'requiredSystemPropertyName/
  requiredSystemPropertyValue' mechanism operates
  independent of this and can be used on both static and
  non static overlays. The effect of specifying a conditional
  property on any overlay is that it will ONLY be enabled
  in the event that the system reflects both the property
  and the specified value (Note that in the ABSENCE of a
  conditional property, overlays are assumed to be enabled).

- has no effect on OverlayManagerService (OMS) API. The
  OMS provides the system with an interface through which
  overlays can be enabled/disabled and even rearranged at
  runtime. This provides the basis of support for various
  user-level features (e.g. dynamic theme selection).
  The 'requiredSystemPropertyName/requiredSystemPropertyValue'
  mechanism operates independent of this -
  with enablement being completely coupled to the available
  system properties on the device and NOT subject to change
  at runtime.

Note: as part of this change, original overlay tests have been
updated (fixed) and expanded to include tests to cover the
conditional property implementation.

Issue: http://b/35100249
Test: frameworks/base/core/tests/overlaytests/testrunner.py

Change-Id: I1990ce21a27a385db1e2f53294b69dd03988351e
(cherry picked from commit d5566c6c47)
2017-04-17 14:12:00 +00:00
Julia Reynolds
f27d6b2b82 Add user to channel/group modification callbacks.
Because listeners can see notifications on managed profiles.

Test: runtest systemui-notification and testing with a sample app
(reading and updating channels and getting change
callbacks on a managed profile)
Change-Id: I5d7af3c417e3a3d18f992cc9ad01fbd7959de398
Fixes: 36783632
2017-04-17 08:44:35 -04:00
Philip P. Moltmann
494c3f5da2 Allow to finish session when all views are gone
An service can option to finish the session once all views that it
declared as important. Views that are important are all autofillable
views of any partition and the saveable fields of the last partition.

Test: CtsAutoFillServiceTestCases
Fixes: 35708237
Change-Id: I0ccade8ebb427e5d8928697ef0007c75d3f83df0
2017-04-16 21:36:25 -07:00
Tyler Gunn
03dbae246e Merge "Expose phone account register/unregister intents." am: 24299f5b06 am: b993a44272
am: d046aa9103

Change-Id: Iece85cdaee561d2e32c634bed2f2bc03a635450c
2017-04-15 22:28:09 +00:00
Ray Essick
b3934d9043 Merge "Rework getMetrics() api per API council" into oc-dev
am: abbea1df6b

Change-Id: I9b8911d615e9521007a1cbb14514d05aef172f57
2017-04-15 19:01:18 +00:00
TreeHugger Robot
abbea1df6b Merge "Rework getMetrics() api per API council" into oc-dev 2017-04-15 18:52:06 +00:00
Stephen Chen
45a1fa12c0 Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
am: e587591c5a

Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
2017-04-15 09:13:41 +00:00
TreeHugger Robot
e587591c5a Merge "Remove ScoredNetwork.BADGING constants." into oc-dev 2017-04-15 09:04:35 +00:00
Treehugger Robot
24299f5b06 Merge "Expose phone account register/unregister intents." 2017-04-15 06:07:27 +00:00
Tyler Gunn
27a83fe547 Expose phone account register/unregister intents.
These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
2017-04-15 04:57:47 +00:00
Jorim Jaggi
9b24dd3186 Merge "Wallpaper color extraction API stub" into oc-dev
am: 6acf7a7b45

Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
2017-04-15 04:56:51 +00:00
Jorim Jaggi
6acf7a7b45 Merge "Wallpaper color extraction API stub" into oc-dev 2017-04-15 04:52:24 +00:00
Eugene Susla
0fb1104b25 Merge "API for notification listener for Companioon apps" into oc-dev
am: 0d88904744

Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
2017-04-15 04:22:48 +00:00