Commit Graph

255075 Commits

Author SHA1 Message Date
Chia-I Wu
2957d9d604 Merge "Fix clipRect transform rounding errors" into nyc-dev 2016-06-01 22:11:39 +00:00
Philip P. Moltmann
9f87935b2e 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
2016-06-01 22:08:13 +00:00
Sreevani Sreejith
2d6015b18b Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs 2016-06-01 21:58:22 +00:00
Alex Klyubin
7fe19060cf Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 2016-06-01 21:55:05 +00:00
Robert Shih
4c3d43d2c2 resolve merge conflicts of d579be0 to nyc-dev-plus-aosp
Change-Id: Ib64df6377d95578581fd7d311aaffc3ef64dd622
2016-06-01 14:53:09 -07:00
Jeff Sharkey
34618b5869 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
2016-06-01 15:51:50 -06:00
sreevanis
c92db9eeef docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Bug:29071043
Change-Id: Iac88710234277210997150e2a6725322928276c3
2016-06-01 14:48:41 -07:00
Jeff Sharkey
98bf12f999 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
2016-06-01 14:52:27 -06:00
Julia Reynolds
6df8a9a89f Merge "Only call finish on operations that have started." into nyc-dev 2016-06-01 20:37:08 +00:00
Daniel Yu
81bd120f26 docs: Updates for picture-in-picture docs for N DP4
Adding two updates requested by eng for DP4: Devs should
use onStop/Start to pause and resume video playback instead
of onPause/Resume. Devs should manage audio focus properly
while in PIP mode to avoid interferring with other audio apps.

Bug: 29045184
Change-Id: Id3c302ff13b76c84bc3f4a51dd2dbf9688403669
2016-06-01 12:59:30 -07:00
Adrian Roos
6510bdeada Merge "Fix DirectReply bug when reapply fails" into nyc-dev 2016-06-01 19:41:50 +00:00
Selim Cinek
470bf5eccb Fixed that volume buttons were not working on the pin input
Because we were intercepting all buttons.

Change-Id: Id2155f23d55cb5282c87409b9c6b8441540ad894
Fixes: 28786740
2016-06-01 12:35:56 -07:00
Chong Zhang
65f1973ba9 Merge "Do not sanitize override config for fullscreen" into nyc-dev 2016-06-01 19:34:04 +00:00
Dianne Hackborn
61721ee3d7 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 2016-06-01 19:29:43 +00:00
Dianne Hackborn
3e05055af7 Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev 2016-06-01 19:26:09 +00:00
Adrian Roos
0789ee0908 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
2016-06-01 12:25:10 -07:00
Chong Zhang
a8cc378d15 Do not sanitize override config for fullscreen
bug: 29063336
Change-Id: I65c5d635133a6b3791ce1aef63547f8d38ca24b5
2016-06-01 12:20:10 -07:00
Sanket Padawe
49b204264e Add carrier config variables for overriding carrier name from carrierconf.
Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
2016-06-01 12:17:23 -07:00
Robert Greenwalt
be718d8836 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
2016-06-01 19:07:45 +00:00
Selim Cinek
42621023cf Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev 2016-06-01 19:03:43 +00:00
Selim Cinek
ed6913b0ce Fixed a crash with notification groups
When updating a notification we were not checking if it is the summary
with children, but about the existence of the childrencontainer, which
can change and is never removed. This is now done correctly.

Change-Id: Ie3838613f414d7fcb158dc92c24e8939cfb7c2ea
Fixes: 29055879
2016-06-01 12:01:17 -07:00
Vasco Brito
ce82f1c16a 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
2016-06-01 18:51:28 +00:00
TreeHugger Robot
31e3b14d6a Merge "Move DownloadsManager to permanent whitelist." into nyc-dev 2016-06-01 18:49:42 +00:00
Julia Reynolds
4357e52820 Only call finish on operations that have started.
Change-Id: I77d10913a68be529ea2c5a3f2a53ad91a4a41f47
Fixes: 29069613
2016-06-01 14:49:40 -04:00
TreeHugger Robot
13d534e7f2 Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev 2016-06-01 18:37:35 +00:00
Eric Schmidt
28ed18877b Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246
am: 51500a1c5a

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

Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
2016-06-01 18:25:35 +00:00
Eric Schmidt
51500a1c5a Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs
am: 8ef79a9246

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

Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
2016-06-01 18:16:17 +00:00
Robert Greenwalt
56bd06fc3e Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" 2016-06-01 18:15:16 +00:00
Adrian Roos
b4cd4650cf Merge "AppError: Change "close" to "close app"" into nyc-dev 2016-06-01 18:14:43 +00:00
Eric Schmidt
556dff9c73 docs: Fixed background optmizations code snippet
Bug: 28341003
Change-Id: I42b26f52ac6f17b684a8a9673b5acd9d9e647a7f
2016-06-01 11:13:57 -07:00
Kevin Hufnagle
b04f86acae 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
2016-06-01 18:10:43 +00:00
Eric Schmidt
8ef79a9246 Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs 2016-06-01 18:04:56 +00:00
Kevin Hufnagle
f5250c5b37 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
2016-06-01 18:02:22 +00:00
TreeHugger Robot
d05a7b5972 Merge "Radio buttons belong in a radio group." into nyc-dev 2016-06-01 18:01:35 +00:00
Dianne Hackborn
970e3f412d 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
2016-06-01 10:55:13 -07:00
Dianne Hackborn
c43a7f89f7 Fix issue #29058724: Improve JobScheduler API demo
We can now include it in the java docs!

Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
2016-06-01 10:48:43 -07:00
TreeHugger Robot
748620e9f0 Merge "Fix call to equals that could never succeed." into nyc-dev 2016-06-01 17:46:03 +00:00
Jason Monk
4215ae0100 Merge "QS: Fix single expanded frame from layout" into nyc-dev 2016-06-01 17:26:53 +00:00
Narayan Kamath
93a01103af 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
2016-06-01 17:26:22 +00:00
Jason Monk
ae42c4a118 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
2016-06-01 17:26:14 +00:00
Jason Monk
2891acd139 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
2016-06-01 17:26:06 +00:00
Adrian Roos
adc3f1ec2b 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
2016-06-01 17:25:52 +00:00
Jason Monk
1ceef7c0fa Merge "QS: Followup to scroll fixes" into nyc-dev 2016-06-01 17:20:17 +00:00
Robert Shih
d579be0cf2 Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev 2016-06-01 17:17:00 +00:00
Mady Mellor
c123c0b4d0 Merge "Adds alpha to dimmed backgrounds" into nyc-dev
am: 0d7dbb0f28

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

Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
2016-06-01 17:06:24 +00:00
Brian Carlstrom
93193135b1 Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev 2016-06-01 17:06:20 +00:00
Jason Monk
8768f68713 Merge "QS: Only put visible tiles in listening state" into nyc-dev 2016-06-01 17:04:26 +00:00
Jason Monk
7b945d8d30 Merge "QS: Protect against crash with no icon" into nyc-dev 2016-06-01 17:04:21 +00:00
TreeHugger Robot
ff39d3ec2f Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 2016-06-01 17:02:00 +00:00
fionaxu
30680c6506 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
2016-06-01 16:56:44 +00:00