Commit Graph

48444 Commits

Author SHA1 Message Date
Seigo Nonaka
12eaf366f9 am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev
* commit '031aead10a77d0a0ffed9ede8d3edef87f28122f':
  Use final in favor of initialization safety.
2015-06-03 05:21:26 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety.
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
2015-06-03 04:53:44 +00:00
Casper Bonde
8b8af64d84 am 80233cda: am 2328423d: Add support for MITM for BluetoothSockets (1/4)
* commit '80233cdabb31800fbe2d9d64eb2033fe5ab7e5e6':
  Add support for MITM for BluetoothSockets (1/4)
2015-06-03 04:10:20 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:40 +00:00
Erik Kline
4d51105164 am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
* commit '43a2c8ff4251039810c09fa5d52bfe40834f265b':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:23:12 +00:00
Svetoslav
f766363a36 am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
  Add annotations to a new API
2015-06-03 02:22:58 +00:00
Jun Mukai
c891bfbb11 am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
* commit '7f0ad420f435da9b57c2911d61803b52adeca528':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 02:22:47 +00:00
Roozbeh Pournader
241ba8684f am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev
* commit '085b657d856e87d884b5d80a7c0d83b735e48c1b':
  Load hyphenation data for more languages.
2015-06-03 02:22:42 +00:00
Casper Bonde
04b892809b am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4)
* commit '0cc2389180db98b93fa24767430d385766ae1378':
  SAP: Change to use new SDP Api (4/4)
2015-06-03 02:22:25 +00:00
Alan Viverette
14d8afc62f am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
* commit '4156c8709bc46d48fb2a92ca580100308f68210d':
  API review feedback for ThemedSpinnerAdapter, Spinner
2015-06-03 02:22:09 +00:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07 Merge "Load hyphenation data for more languages." into mnc-dev 2015-06-03 00:56:24 +00:00
Casper Bonde
da177bb5a0 SAP: Change to use new SDP Api (4/4)
Added class to carry SAP SDP record data.

Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 00:04:37 +00:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Jorim Jaggi
ecfeefb483 am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
* commit 'f7f90276a1f262c0db855edc49d544e157bc6e7f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
2015-06-02 22:49:06 +00:00
Nicolas Prevot
8a4dbac598 am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5 am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
  Fix java doc
2015-06-02 22:28:42 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Svetoslav
12e7abc659 am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
  Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request.
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Jun Mukai
3427f57e03 Retire PFLAG_ONLY_DRAWS_BACKGROUND.
Per discussion on another CL, this CL retires
PFLAG_ONLY_DRAWS_BACKGROUND because this is over-optimizing and
misleading.  Also setFlags() needs to care both the background
and the foreground.

Bug: 20734520
Change-Id: I57d63e776b5fbad9effd10ad87e683bbb2a6dacd
2015-06-02 14:27:35 -07:00
Brian Attwell
6b37b0df11 am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
* commit '03c818b575c9f4481fee3ceaf21ac07540a69619':
  Decouple ProviderStatus & internal provider state
2015-06-02 21:16:41 +00:00
Amith Yamasani
9984f181c5 am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
  Temporarily whitelist an app for network during doze
2015-06-02 21:10:40 +00:00
Robin Lee
9aa9054169 am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
  Device policy: consistent javadoc and annotations
2015-06-02 21:10:18 +00:00
Wale Ogunwale
be86841c64 am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
* commit '28e00af912154849c7e2bc592e16ee77155038e3':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 21:09:30 +00:00
Robin Lee
24613fae6b am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
  Revert "Consistent documentation and annotations for DPMS"
2015-06-02 21:09:09 +00:00
Robin Lee
b95551290a am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS
2015-06-02 21:09:03 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public.
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
2015-06-02 14:04:41 -07:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
2015-06-02 20:56:27 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Robin Lee
02a400ca6e Merge "Device policy: consistent javadoc and annotations" into mnc-dev 2015-06-02 19:53:41 +00:00
Robin Lee
25e264507c Device policy: consistent javadoc and annotations
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted/fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: Iadfa78c5170bf4899a9daaf93c3d4e9d8b170a45
2015-06-02 11:55:21 -07:00
Wale Ogunwale
c9a0452244 Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 2015-06-02 18:54:55 +00:00
Robin Lee
f4d9ecc503 Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 2015-06-02 18:25:43 +00:00
Robin Lee
49ec19ef6c Revert "Consistent documentation and annotations for DPMS"
This reverts commit 695142a17a.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
2015-06-02 18:25:28 +00:00
Robin Lee
5de95550b7 Merge "Consistent documentation and annotations for DPMS" into mnc-dev 2015-06-02 18:16:26 +00:00
Robin Lee
695142a17a Consistent documentation and annotations for DPMS
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
2015-06-02 11:15:34 -07:00
Wale Ogunwale
3540f93654 @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
2015-06-02 11:07:07 -07:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
2015-06-02 11:05:03 -07:00
Carlos Valdivia
e3f430e1dc am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
* commit '2ca505718d6a607e49dbab8704dc354c72e371ce':
  System Health: Support expiring tokens
2015-06-02 17:49:10 +00:00
Wei Wang
4db77febac am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
* commit '9619528558e9d97eb518d29f7cf72b5fa3fe194c':
  Expose a few system APIs for BLE scan only mode.
2015-06-02 17:48:59 +00:00