16870 Commits

Author SHA1 Message Date
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Etan Cohen
c1b654a09e [CM] Unhide the NetworkSpecifier as object API
API visibility change: unhide allowing NetworkSpecifier
to be an arbitrary object.

Bug: 27533960
Bug: 36053921
Bug: 36275276
Test: builds and runs
Change-Id: I1d1705cca7ece077ef8d7c674c62d5369fedbb03
Merged-In: I7535495681da8f168c46d6d95e13925cffecc99b
Merged-In: I6500639ae839ee9ad5af34d1292d1539c943e2ad
2017-04-14 18:23:45 +09:00
Jakub Pawlowski
a51513747a Bluetooth 5 PHY simplification
Having PHY_LE_* constants defined in four different places, with one
value being different than others is misleading. Leave just PHY_LE_*
definitions in BluetoothDevice, and add PHY_LE*_MASK for the mask used
in PHY update API.

This patch also removes need to translate PHY value between PHY update
request and event, as mask is used for request, and the value is
returned in event.

Bug: 30622771
Test: manual
Change-Id: I897effa1204a024465d55501c83c542566c4d37c
(cherry picked from commit 9e377194e35c0fb9ac5771f5658c095ed97e0838)
2017-04-14 07:33:55 +00:00
Andrii Kulian
aa412973d9 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev
am: c66b6ff997

Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
2017-04-14 05:17:33 +00:00
Andrii Kulian
c66b6ff997 Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 2017-04-14 05:05:25 +00:00
Dmitry Dementyev
11e1805ab3 Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
am: 2a30085e5c

Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
2017-04-14 04:33:27 +00:00
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
2017-04-14 04:11:29 +00:00
TreeHugger Robot
2a30085e5c Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 2017-04-14 03:53:52 +00:00
Jorim Jaggi
7d0d102752 Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: Ie2aec4764d958086897296ed0fc3c39c55c4d8aa
Merged-In: I9a5bc19b8f63312e682e536500411e4ff4639f88
2017-04-13 19:43:45 -07:00
Todd Lee
d5566c6c47 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
2017-04-13 19:33:11 -07:00
TreeHugger Robot
ad989b1711 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 2017-04-14 01:44:06 +00:00
Dianne Hackborn
9596d71664 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
am: 676bd21542

Change-Id: I0e806e12b361b90eb4f349a7624d5f5ce4c91a9b
2017-04-14 01:08:26 +00:00
Dianne Hackborn
676bd21542 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev 2017-04-14 00:56:39 +00:00
Jeff Tinker
a29ecc1a1c Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
am: 92fc8bdd51

Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50
2017-04-14 00:18:41 +00:00
Christopher Tate
60977f42db Introduce NETWORK_TYPE_METERED job constraint
When your job wants non-WiFi connectivity.

Bug 37219369
Test: CTS

Change-Id: I0981938061b6b7f354e7236221552ef03976f470
2017-04-13 17:14:07 -07:00
TreeHugger Robot
92fc8bdd51 Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev 2017-04-14 00:09:42 +00:00
Sam Lin
e707f83e8e Make android.intent.action.MASTER_CLEAR depreciation explicit
Bug: 36977779
Test: make sailfish cts
Test: run cts -o -m CtsSignatureTestCases -t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
Change-Id: I7c18f9c3c1b73b4feca6904f927266f6973d889c
2017-04-13 17:00:55 -07:00
jiabin
4f499a0a17 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev
am: 2ec7decaa5

Change-Id: Ic648086244bcc0df6b35cf8b8439d0bc200917d7
2017-04-13 23:48:18 +00:00
Jorim Jaggi
4b84606c21 Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: I9a5bc19b8f63312e682e536500411e4ff4639f88
2017-04-13 16:39:44 -07:00
TreeHugger Robot
2ec7decaa5 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev 2017-04-13 23:39:13 +00:00
Peng Xu
70004dd19c Merge "Address review suggestions for sensor direct report related APIs" into oc-dev
am: 5ebb159a92

Change-Id: I39838189ba70cd74e726d4332e1c2adfb5b269d6
2017-04-13 23:33:43 +00:00
TreeHugger Robot
5ebb159a92 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev 2017-04-13 23:24:42 +00:00
Makoto Onuki
efda6390c9 Merge "Actually remove the chooser APIs" into oc-dev
am: fbadd6dac9

Change-Id: Ibb59269e2da0698ebc7140c08de8265059be8033
2017-04-13 23:17:21 +00:00
Evan Rosky
d6072f2900 Merge "Improve rect-level focus ordering" into oc-dev
am: 197052d6cb

Change-Id: I3e155776f9ccffb6f0a2d19b73ec73f0b8bf829b
2017-04-13 23:14:53 +00:00
TreeHugger Robot
fbadd6dac9 Merge "Actually remove the chooser APIs" into oc-dev 2017-04-13 23:08:55 +00:00
Evan Rosky
197052d6cb Merge "Improve rect-level focus ordering" into oc-dev 2017-04-13 23:06:18 +00:00
Nathan Harold
09098dc441 Add FileDescriptor Versions of applyTransportModeTransform()
Because there is no way using the Java sockets API to actually
get a socket of AF_INET on mode machines, it is necessary to
provide a way to apply transforms to sockets made using the
native wrapper API, which uses POSIX APIs and will create a
socket that is AF_INET.

Bug: 36073210
Test: b/34811227
Change-Id: I28ac7cc4f36045ce523a54111e5be975b0331356
2017-04-13 15:05:13 -07:00
Nathan Harold
5ad768c3b7 IpSecManager and IpSecAlgorithm API Tweaks
-Add a reserveSecurityParamterIndex() function that allows the
 system to select an SPI.
-Disallow INVALID_SECURITY_PARAMETER_INDEX from being passed as
 an explicit SPI request.
-Remove the ALGO_ prefix from constants in IpSecAlgorithm

Bug: 36073210
Test: Updated CTS tests still pass on bullhead
Change-Id: Ic94809996076b0718f153f550b82192fe7048a2e
2017-04-13 15:04:47 -07:00
Dongwon Kang
2566af67e5 TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms
Test: build
Bug: 37288064
Change-Id: I4750547a2550ef058c5fbdeca344fe5a94fc3fc9
2017-04-13 14:58:45 -07:00
Dongwon Kang
3d9ecc264d Merge "TIF: add helper methods for making a channel browsable." into oc-dev
am: b2eb818a7d

Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
2017-04-13 21:32:15 +00:00
TreeHugger Robot
b2eb818a7d Merge "TIF: add helper methods for making a channel browsable." into oc-dev 2017-04-13 21:23:48 +00:00
Peng Xu
3c8c6a4cc9 Address review suggestions for sensor direct report related APIs
Changes inline with bug number

Some improvements about SensorDirectChannel class.
  * Complete the doc about creation of SensorDirectChannel object.
  * Make SensorDirectChannel implements java.nio.channels.Channel.
  * Change isValid() to isOpen().
  * Make close() thread safe.
Bug: 36550285

  * Throw exception on failure of SensorManager.createDirectChannel.
  * Change to use NullPointerException when unexpected null pointer
    is passed in.
Bug: 36555061

  * Move SensorManager.configureDirectChannel() to
    SensorDirectChannel.configure().
  * Format SensorDirectChannel.configure() function doc with
    <pre></pre> to maintain the table structure.
  * Reworded Sensor.isDirectChannelTypeSupported java doc.
Bug: 36555604

Test: pass updated cts SensorDirectReportTest
Change-Id: I447121eaf414cbc94292a109a9d93d2e3c89f8f4
2017-04-13 14:17:11 -07:00
Dmitry Dementyev
a461e30053 Add ACTION_ACCOUNT_REMOVED to Account Manager.
AccountManagerService sends an intent with the action when account of any type is removed or renamed.

Test: manual, APCT.
Bug: 37280078

Change-Id: I53b1bb9d6cde1edba5c37ecf3e4e13d748b19005
2017-04-13 21:10:50 +00:00
Alan Viverette
04fd470ce0 Update more implementations of findViewById()
Bug: 24137209
Test: make checkbuild -j32
Change-Id: I104969fc74d6dc1d159e3d1ff5926640b124a540
2017-04-13 16:50:32 -04:00
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
2017-04-13 19:45:30 +00:00
Seigo Nonaka
17452ee553 Merge "Introduce setFallbackTypeface" into oc-dev
am: 729a515e5e

Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
2017-04-13 19:38:09 +00:00
Yu Liu
5303f33bdc Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
am: e425b366ba

Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
2017-04-13 19:34:48 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
TreeHugger Robot
729a515e5e Merge "Introduce setFallbackTypeface" into oc-dev 2017-04-13 19:21:25 +00:00
Yu Liu
e425b366ba Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev 2017-04-13 19:21:03 +00:00
Andrii Kulian
22512e8a22 Hide flag SHOW_WITH_INSECURE_KEYGUARD
Bug: 36555156
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I831ada0ffd35ab96af8ae821588c9f6e0ff30e5a
2017-04-13 11:35:40 -07:00
jiabin
0b8df1dedb Add TvProvider methods to block or unblock package, get blocked packages
Test: gts-tradefed run gts -m GtsTvTestCases
Bug: 36697660
Change-Id: I6464542820a4b56e3145eecdf28ebd422a567040
2017-04-13 11:35:28 -07:00
Steve McKay
0b28e794de Merge "Remove support for auto-paging of cursors." into oc-dev
am: 7f0d8c8076

Change-Id: Ice100c419ce6d53721d6bbec1147bb1cc1bb7b4d
2017-04-13 18:26:43 +00:00
TreeHugger Robot
7f0d8c8076 Merge "Remove support for auto-paging of cursors." into oc-dev 2017-04-13 18:12:14 +00:00
Makoto Onuki
d3aebf3320 Actually remove the chooser APIs
Test: build
Bug: 36186790
Change-Id: Ib03bb482c266f4c4f1080ca776c738d11a175219
2017-04-13 18:02:21 +00:00
Seigo Nonaka
b87a2f041d Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev am: d09be1c0e9
am: 284944c7f8

Change-Id: Idae84335677a859641b6660589848e04b4a38474
2017-04-13 17:57:46 +00:00
Seigo Nonaka
284944c7f8 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev
am: d09be1c0e9

Change-Id: I51f68dc5b1453ca4ac700ca68976efd412812eae
2017-04-13 17:40:02 +00:00