OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:10:39 +0000 (00:10 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
am: bd2b9e0d53

* commit 'bd2b9e0d53a211d0a5093b8bf24ac32e1a72ffea':
  TIF: Release an existing audio patch before creating a new one

Change-Id: I85a8f3e89feb7953100b9a56cf4306aef78cd530

8 years agoMerge "Fix documentation for channel types" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:10:33 +0000 (00:10 +0000)]
Merge "Fix documentation for channel types" into nyc-dev
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I4d70f850761d639d4f9ceeff1fe3d33483267415

8 years agoMerge "Use text input to deal with fullscreen IME" into nyc-dev
Philip P. Moltmann [Thu, 2 Jun 2016 00:10:26 +0000 (00:10 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev
am: ddf5c44567

* commit 'ddf5c445673bab848b3d9c8af4de8978daf9b56b':
  Use text input to deal with fullscreen IME

Change-Id: I0aadae2eac2b0bbf81658525aeda70ca2512337c

8 years agoMerge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:04:16 +0000 (00:04 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev

8 years agoMerge "Fix documentation for channel types" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:03:52 +0000 (00:03 +0000)]
Merge "Fix documentation for channel types" into nyc-dev

8 years agoMerge "Use text input to deal with fullscreen IME" into nyc-dev
Philip P. Moltmann [Wed, 1 Jun 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev

8 years agoMerge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
Lajos Molnar [Wed, 1 Jun 2016 23:44:12 +0000 (23:44 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b

8 years agoMerge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 23:29:48 +0000 (23:29 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev

8 years agoMerge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
Jeff Sharkey [Wed, 1 Jun 2016 23:27:00 +0000 (23:27 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
am: 9bdf289f0a

* commit '9bdf289f0a1874d151684497cb3acd8f96fbd58d':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I50f93b3e867140199f1de253f283c220c1df211e

8 years agoMerge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 23:15:19 +0000 (23:15 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev

8 years agoMerge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API referenc...
sreevanis [Wed, 1 Jun 2016 23:04:35 +0000 (23:04 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7
am: 82c9562d3c

* commit '82c9562d3c35df6569fcb04e7cd999fdc11d5d99':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: Iedcb96181b7a4e6a7b6ac94eb73bcb466ae19139

8 years agoMerge "Installer connection support for dump_profiles" into nyc-dev
David Sehr [Wed, 1 Jun 2016 23:04:25 +0000 (23:04 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872

8 years agoMerge "Release AssetManagers when ejecting storage." into nyc-dev
Jeff Sharkey [Wed, 1 Jun 2016 23:04:09 +0000 (23:04 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c

8 years agoMerge "Fix clipRect transform rounding errors" into nyc-dev
Chia-I Wu [Wed, 1 Jun 2016 23:04:00 +0000 (23:04 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev
am: 2957d9d604

* commit '2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
  Fix clipRect transform rounding errors

Change-Id: I723039f1930ac2289e4015322e744cdf937dbea2

8 years agoMerge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
Alex Klyubin [Wed, 1 Jun 2016 23:03:51 +0000 (23:03 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
am: 7fe19060cf

* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I5f93eac591446733fe7188e149ad5c4d970a1ba3

8 years agoMerge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API referenc...
Sreevani Sreejith [Wed, 1 Jun 2016 22:54:06 +0000 (22:54 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b
am: 441209abc7

* commit '441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I761a39db759030d4f07cb6e77326fc45db215677

8 years agoMerge "Only call finish on operations that have started." into nyc-dev
Julia Reynolds [Wed, 1 Jun 2016 22:49:18 +0000 (22:49 +0000)]
Merge "Only call finish on operations that have started." into nyc-dev
am: 6df8a9a89f

* commit '6df8a9a89fc87649595926592bf895768c861b68':
  Only call finish on operations that have started.

Change-Id: I7e9d30640800ace35a19f17d327b1db6ece42edf

8 years agoMerge "Fix DirectReply bug when reapply fails" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 22:49:13 +0000 (22:49 +0000)]
Merge "Fix DirectReply bug when reapply fails" into nyc-dev
am: 6510bdeada

* commit '6510bdeada8b670b1c9863fdb7b518e161105c09':
  Fix DirectReply bug when reapply fails

Change-Id: Ie4b164d285b25ab359b087e7d002c4cdf97dd3ee

8 years agoMerge "Do not sanitize override config for fullscreen" into nyc-dev
Chong Zhang [Wed, 1 Jun 2016 22:49:08 +0000 (22:49 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev
am: 65f1973ba9

* commit '65f1973ba9f91c6727a7131b31b6c563cd880ee0':
  Do not sanitize override config for fullscreen

Change-Id: Ic9c62b12f529e17c39ac7f466433cb30cb13f356

8 years agoMerge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 22:48:59 +0000 (22:48 +0000)]
Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d

8 years agoMerge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into...
Dianne Hackborn [Wed, 1 Jun 2016 22:48:52 +0000 (22:48 +0000)]
Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev
am: 3e05055af7

* commit '3e05055af775f9539d832b1191ae2ee9bc4acf21':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I8e472de1aca491dabd1bd2bfc456560fabc16221

8 years agoMerge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API referenc...
sreevanis [Wed, 1 Jun 2016 22:46:44 +0000 (22:46 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
am: 2d6015b18b

* commit '2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I76168738a10e3f379134a88a89667a63d818323d

8 years agoMerge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
Selim Cinek [Wed, 1 Jun 2016 22:45:59 +0000 (22:45 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
am: 42621023cf

* commit '42621023cfac084b8c74fd4d362bc2c64d61674e':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: Ic871ddca73896db588ca8436c2aea92c50eb37aa

8 years agoMerge "Move DownloadsManager to permanent whitelist." into nyc-dev
Felipe Leme [Wed, 1 Jun 2016 22:45:33 +0000 (22:45 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am: 31e3b14d6a

* commit '31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
  Move DownloadsManager to permanent whitelist.

Change-Id: I2d36bc51ff244a0890824e376602f22baa0c4b7b

8 years agoMerge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
Jorim Jaggi [Wed, 1 Jun 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev
am: 13d534e7f2

* commit '13d534e7f2419219e3e26e582b1f6f5ae79be408':
  Don't crash activity manager when supplying invalid URI

Change-Id: Iddb17cdf953668ad8bfae6a54a5eb9141ec12ad2

8 years agoMerge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a
Eric Schmidt [Wed, 1 Jun 2016 22:44:58 +0000 (22:44 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a
am: 28ed18877b

* commit '28ed18877bc9cc040e8cea678f7a7782426c1dc9':
  docs: Fixed 'MessageStyle' typo

Change-Id: Iff30a4c4e9c9b45939d780aebe34ac74bdfb5f8d

8 years agoMerge "AppError: Change "close" to "close app"" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 22:44:44 +0000 (22:44 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13

8 years agocherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185...
Kevin Hufnagle [Wed, 1 Jun 2016 22:26:19 +0000 (22:26 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37
am: b04f86acae

* commit 'b04f86acae9f5a0101e997a2dde08342c92b180f':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Id5b9ffebcafb4035b6d330e9aae0d65a09a282e2

8 years agoMerge "Radio buttons belong in a radio group." into nyc-dev
Julia Reynolds [Wed, 1 Jun 2016 22:24:21 +0000 (22:24 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev
am: d05a7b5972

* commit 'd05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
  Radio buttons belong in a radio group.

Change-Id: Ia5b4cd5135fb78ccf98f1b05e63fafc7a04349d8

8 years agoMerge "Fix call to equals that could never succeed." into nyc-dev
Ian Rogers [Wed, 1 Jun 2016 22:20:47 +0000 (22:20 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev
am: 748620e9f0

* commit '748620e9f03dd66bfed38d91d32b35d79684173b':
  Fix call to equals that could never succeed.

Change-Id: I27b594ae75430b5cb9fe3bc905461b547ba5841c

8 years agoMerge "QS: Fix single expanded frame from layout" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 22:20:22 +0000 (22:20 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev
am: 4215ae0100

* commit '4215ae01002f1217587698d24636870ace4a50f5':
  QS: Fix single expanded frame from layout

Change-Id: I49972e1a12bf6eeec91e845550c81a7eb41a0ecc

8 years agoMerge "QS: Followup to scroll fixes" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 22:20:16 +0000 (22:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev
am: 1ceef7c0fa

* commit '1ceef7c0fab15af522f56ade3e08abf559622181':
  QS: Followup to scroll fixes

Change-Id: I7a0a3962cd1efef365787cb25aa70b77c6b403bf

8 years agoMerge "Installer connection support for dump_profiles" into nyc-dev
David Sehr [Wed, 1 Jun 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev

8 years agoMerge "Release AssetManagers when ejecting storage." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 22:14:56 +0000 (22:14 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev

8 years agoMerge "Fix clipRect transform rounding errors" into nyc-dev
Chia-I Wu [Wed, 1 Jun 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev

8 years agoUse text input to deal with fullscreen IME
Philip P. Moltmann [Wed, 1 Jun 2016 22:07:04 +0000 (15:07 -0700)]
Use text input to deal with fullscreen IME

The full screen "number" keyboard strips all non-numeric letters
out of the text field.

Bug: 29004437
Change-Id: Ic7e79106a7fcf0716a28061592221557b9d62f52

8 years agoMerge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API referenc...
Sreevani Sreejith [Wed, 1 Jun 2016 21:58:20 +0000 (21:58 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs

8 years agoMerge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
Alex Klyubin [Wed, 1 Jun 2016 21:55:04 +0000 (21:55 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev

8 years agoresolve merge conflicts of d579be0 to nyc-dev-plus-aosp
Robert Shih [Wed, 1 Jun 2016 21:53:09 +0000 (14:53 -0700)]
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp

Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622

8 years agoSkip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
Jeff Sharkey [Wed, 1 Jun 2016 21:51:19 +0000 (15:51 -0600)]
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

When FLAG_WILL_BE_FOREGROUND is set on a job (such as a download), we
need to treat the job as if it had a foreground service running so
it can continue making forward progress.  We already ignore the device
idle state when offering to start the job, so this just avoids the
hiccup of stopping the job only to restart it a minute later.

Bug: 26571724
Change-Id: I348903dd3a7dd7104b0c1bf4310e2a48655d2588

8 years agodocs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
sreevanis [Wed, 1 Jun 2016 19:37:12 +0000 (12:37 -0700)]
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Bug:29071043
Change-Id: Iac88710234277210997150e2a6725322928276c3

8 years agoRelease AssetManagers when ejecting storage.
Jeff Sharkey [Thu, 26 May 2016 17:56:57 +0000 (11:56 -0600)]
Release AssetManagers when ejecting storage.

When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.

This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected.  (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)

Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.

Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a

8 years agoMerge "Only call finish on operations that have started." into nyc-dev
Julia Reynolds [Wed, 1 Jun 2016 20:37:07 +0000 (20:37 +0000)]
Merge "Only call finish on operations that have started." into nyc-dev

8 years agoMerge "Fix DirectReply bug when reapply fails" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Fix DirectReply bug when reapply fails" into nyc-dev

8 years agoMerge "Do not sanitize override config for fullscreen" into nyc-dev
Chong Zhang [Wed, 1 Jun 2016 19:34:02 +0000 (19:34 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev

8 years agoMerge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 19:29:41 +0000 (19:29 +0000)]
Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev

8 years agoMerge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into...
Dianne Hackborn [Wed, 1 Jun 2016 19:26:07 +0000 (19:26 +0000)]
Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev

8 years agoFix DirectReply bug when reapply fails
Adrian Roos [Wed, 1 Jun 2016 18:34:58 +0000 (11:34 -0700)]
Fix DirectReply bug when reapply fails

RemoteInputView failed to notice updates where the
reapply failed, causing it to reopen upon success.

Change-Id: I4fdd4d3240da6e38878d281fbf8c654ee9a682c3
Fixes: 29057180

8 years agoDo not sanitize override config for fullscreen
Chong Zhang [Wed, 1 Jun 2016 19:20:10 +0000 (12:20 -0700)]
Do not sanitize override config for fullscreen

bug: 29063336
Change-Id: I65c5d635133a6b3791ce1aef63547f8d38ca24b5

8 years agoMerge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e
Robert Greenwalt [Wed, 1 Jun 2016 19:07:45 +0000 (19:07 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e
am: ce82f1c16a

* commit 'ce82f1c16a4c10e003a11020fcb3c232010c40c6':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3

8 years agoMerge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev
Selim Cinek [Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)]
Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev

8 years agoMerge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Vasco Brito [Wed, 1 Jun 2016 18:51:28 +0000 (18:51 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
am: 56bd06fc3e

* commit '56bd06fc3e29290ba90b792a7f7353864cbf772a':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68

8 years agoMerge "Move DownloadsManager to permanent whitelist." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:49:41 +0000 (18:49 +0000)]
Merge "Move DownloadsManager to permanent whitelist." into nyc-dev

8 years agoOnly call finish on operations that have started.
Julia Reynolds [Wed, 1 Jun 2016 18:17:58 +0000 (14:17 -0400)]
Only call finish on operations that have started.

Change-Id: I77d10913a68be529ea2c5a3f2a53ad91a4a41f47
Fixes: 29069613

8 years agoMerge "Don't crash activity manager when supplying invalid URI" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:37:34 +0000 (18:37 +0000)]
Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev

8 years agoMerge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246
Eric Schmidt [Wed, 1 Jun 2016 18:25:35 +0000 (18:25 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246
am: 51500a1c5a

* commit '51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
  docs: Fixed 'MessageStyle' typo

Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963

8 years agoMerge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
Eric Schmidt [Wed, 1 Jun 2016 18:16:17 +0000 (18:16 +0000)]
Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am: 8ef79a9246

* commit '8ef79a9246eba129c22e5d54654ecb85414edf22':
  docs: Fixed 'MessageStyle' typo

Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2

8 years agoMerge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""

8 years agoMerge "AppError: Change "close" to "close app"" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 18:14:41 +0000 (18:14 +0000)]
Merge "AppError: Change "close" to "close app"" into nyc-dev

8 years agocherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185
Kevin Hufnagle [Wed, 1 Jun 2016 18:10:43 +0000 (18:10 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185
am: f5250c5b37

* commit 'f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574

8 years agoMerge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs
Eric Schmidt [Wed, 1 Jun 2016 18:04:55 +0000 (18:04 +0000)]
Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs

8 years agocherry-pick: docs: Added note that <application> at end of manifest.
Kevin Hufnagle [Wed, 1 Jun 2016 18:02:22 +0000 (18:02 +0000)]
cherry-pick: docs: Added note that <application> at end of manifest.
am: d5368b8185

* commit 'd5368b81857a04879ed55be2a67f034cce4e5094':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489

8 years agoMerge "Radio buttons belong in a radio group." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 18:01:34 +0000 (18:01 +0000)]
Merge "Radio buttons belong in a radio group." into nyc-dev

8 years agoFix issue #29069028 NYC: device boot failure: NPE in AppIdleController
Dianne Hackborn [Wed, 1 Jun 2016 17:55:13 +0000 (10:55 -0700)]
Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Make sure the core parts of JobSchedulerService are initialized
before we start creating the controllers.

Change-Id: I497df12f7e6fbd93581291ec691c4b45104d67d0

8 years agoFix issue #29058724: Improve JobScheduler API demo
Dianne Hackborn [Wed, 1 Jun 2016 17:48:43 +0000 (10:48 -0700)]
Fix issue #29058724: Improve JobScheduler API demo

We can now include it in the java docs!

Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2

8 years agoMerge "Fix call to equals that could never succeed." into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Fix call to equals that could never succeed." into nyc-dev

8 years agoMerge "QS: Fix single expanded frame from layout" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:26:52 +0000 (17:26 +0000)]
Merge "QS: Fix single expanded frame from layout" into nyc-dev

8 years agoMerge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
Narayan Kamath [Wed, 1 Jun 2016 17:26:22 +0000 (17:26 +0000)]
Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev
am: 93193135b1

* commit '93193135b184a2f1c7518d8beeff7c51b2880606':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: Ic765c13a476c0924d2ede278b379db86d634fa1f

8 years agoMerge "QS: Only put visible tiles in listening state" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:26:14 +0000 (17:26 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev
am: 8768f68713

* commit '8768f687138510b90dd997e41720ad7d88637b49':
  QS: Only put visible tiles in listening state

Change-Id: I361a2ad640505ec2b1f10adb31e41aea0daced4e

8 years agoMerge "QS: Protect against crash with no icon" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev
am: 7b945d8d30

* commit '7b945d8d30a6e3978b50d5952539279a71148eca':
  QS: Protect against crash with no icon

Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead

8 years agoMerge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
Adrian Roos [Wed, 1 Jun 2016 17:25:52 +0000 (17:25 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
am: ff39d3ec2f

* commit 'ff39d3ec2fa773a50bbd069a40570767c80fd404':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2

8 years agoMerge "QS: Followup to scroll fixes" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:20:16 +0000 (17:20 +0000)]
Merge "QS: Followup to scroll fixes" into nyc-dev

8 years agoMerge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev
Robert Shih [Wed, 1 Jun 2016 17:16:59 +0000 (17:16 +0000)]
Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev

8 years agoMerge "Adds alpha to dimmed backgrounds" into nyc-dev
Mady Mellor [Wed, 1 Jun 2016 17:06:24 +0000 (17:06 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b

8 years agoMerge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev
Brian Carlstrom [Wed, 1 Jun 2016 17:06:19 +0000 (17:06 +0000)]
Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev

8 years agoMerge "QS: Only put visible tiles in listening state" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:24 +0000 (17:04 +0000)]
Merge "QS: Only put visible tiles in listening state" into nyc-dev

8 years agoMerge "QS: Protect against crash with no icon" into nyc-dev
Jason Monk [Wed, 1 Jun 2016 17:04:20 +0000 (17:04 +0000)]
Merge "QS: Protect against crash with no icon" into nyc-dev

8 years agoMerge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 17:01:58 +0000 (17:01 +0000)]
Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev

8 years agoMerge "trim and strip html tags for load safe label name" into nyc-dev
fionaxu [Wed, 1 Jun 2016 16:56:44 +0000 (16:56 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03

8 years agoMerge "Adds alpha to dimmed backgrounds" into nyc-dev
Mady Mellor [Wed, 1 Jun 2016 16:53:49 +0000 (16:53 +0000)]
Merge "Adds alpha to dimmed backgrounds" into nyc-dev

8 years agoMerge "trim and strip html tags for load safe label name" into nyc-dev
Chen Xu [Wed, 1 Jun 2016 16:47:17 +0000 (16:47 +0000)]
Merge "trim and strip html tags for load safe label name" into nyc-dev

8 years agoFixes a few bugs on the keyguard with font density changes
Selim Cinek [Tue, 31 May 2016 22:28:28 +0000 (15:28 -0700)]
Fixes a few bugs on the keyguard with font density changes

The reinflation of the system icons was not working correctly
and all the paddings were of.
Also the affordance icons were outdated and had to be reloaded.

Change-Id: I3cf338d33a82c8be94d01561d7b7d9a37a563ad9
Fixes: 28968657
Fixes: 28672410

8 years agoMerge "Work on issue #28942589: Tune job scheduler" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 16:38:18 +0000 (16:38 +0000)]
Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549

8 years agoRadio buttons belong in a radio group.
Julia Reynolds [Wed, 1 Jun 2016 15:37:29 +0000 (11:37 -0400)]
Radio buttons belong in a radio group.

Fix for 'multiple buttons selected at once' issue.

Change-Id: Iec54eac699886ed1c7b8afd91382ff9b5750c696
Fixes: 27698976

8 years agoFix call to equals that could never succeed.
Ian Rogers [Mon, 30 May 2016 22:16:30 +0000 (15:16 -0700)]
Fix call to equals that could never succeed.

Caught by Error Prone.
Bug: 29045331

Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
(cherry picked from commit edf2f5747b9adc3399b59eb478c94641b1021222)

8 years agoMerge "Work on issue #28942589: Tune job scheduler" into nyc-dev
Dianne Hackborn [Wed, 1 Jun 2016 16:27:04 +0000 (16:27 +0000)]
Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev

8 years agoPackageManager: Don't clear app profiles during system upgrades.
Narayan Kamath [Wed, 1 Jun 2016 14:18:14 +0000 (15:18 +0100)]
PackageManager: Don't clear app profiles during system upgrades.

They don't need to be cleared and will remain valid as long as
the application itself hasn't changed.

bug: 28998083
bug: 29067239
Change-Id: I2e4a4ee1b168da81073b8e70b12918db592fe691

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 1 Jun 2016 15:33:43 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: a007e877f2  -s ours

* commit 'a007e877f2ed32bd51d6c03e94e20eac94ef4081':
  Import translations. DO NOT MERGE

Change-Id: I261c5b972c2cf481fcfd2cd69ae7b4803ca8fac1

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 1 Jun 2016 15:33:18 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f9a6f33091  -s ours

* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
  Import translations. DO NOT MERGE

Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 1 Jun 2016 15:33:02 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 072150db89  -s ours

* commit '072150db89de9fda26bd2150242ab31f9309ec70':
  Import translations. DO NOT MERGE

Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:26:42 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:25:34 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoFix documentation for channel types
Jae Seo [Tue, 31 May 2016 22:59:02 +0000 (15:59 -0700)]
Fix documentation for channel types

Bug: 28747244
Change-Id: I492bdb94400b298d7f2e0ccf9054761e60c5a548

8 years agoInstaller connection support for dump_profiles
David Sehr [Tue, 24 May 2016 22:25:23 +0000 (15:25 -0700)]
Installer connection support for dump_profiles

Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca

8 years agoQS: Fix single expanded frame from layout
Jason Monk [Wed, 1 Jun 2016 15:19:26 +0000 (11:19 -0400)]
QS: Fix single expanded frame from layout

During animation it was resetting the QS expansion on layout which
made a frame of fully expanded appear.

Bug: 28008271
Change-Id: I6ac44cb918bdf53da0653332eabf0f4e96779cff

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoQS: Protect against crash with no icon
Jason Monk [Wed, 1 Jun 2016 14:25:01 +0000 (10:25 -0400)]
QS: Protect against crash with no icon

Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes: 28941131

8 years agoFix action mode animation on recreations - framework edition
Chris Banes [Wed, 1 Jun 2016 13:54:01 +0000 (13:54 +0000)]
Fix action mode animation on recreations - framework edition
am: e65b3fbb63

* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
  Fix action mode animation on recreations - framework edition

Change-Id: Ic990cf5fdb98e86083ccfe54f8f3e6905aa3e375

8 years agoFix action mode animation on recreations - framework edition
Chris Banes [Wed, 1 Jun 2016 10:39:54 +0000 (11:39 +0100)]
Fix action mode animation on recreations - framework edition

Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.

This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.

BUG: 29036694

Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 1 Jun 2016 13:09:15 +0000 (06:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import