Commit Graph

266851 Commits

Author SHA1 Message Date
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
Ta-wei Yen
912e2b2c80 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 2016-06-01 21:49:47 +00: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
Doris Liu
94db09917a Throw Exception for wrong valueType with API guard
Previously, wrong valueType error is swallowed in jni. As a result,
some animations are quietly skipped without letting developers know.
This CL maintains that behavior for pre-N, and throws Exception
to notify developers of the error for N and above.

Bug: 29009391
Change-Id: I3e8f003cdb97d214da72af3f93a84f64797b1c2c
2016-06-01 14:22:28 -07:00
Jason Monk
ed68c27fd7 Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 am: a58c1a52ac
am: 71a7976e35

* commit '71a7976e35ceec565c62e969ba055772919b32ef':
  QS: Protect against crash with no icon

Change-Id: Ia0d657c1935662f880604be702ce5858522e41b2
2016-06-01 21:12:33 +00:00
Adrian Roos
8bfaf5fbff Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: 72bc1299f2
am: 86a0e3befe

* commit '86a0e3befe175ebfed8a701ab9be192f909345c3':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I53c30dbef2ebcd9f85a753dffd93ddafbd000508
2016-06-01 21:12:10 +00:00
Mady Mellor
f3920be3e5 Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 am: c123c0b4d0" into nyc-mr1-dev-plus-aosp
am: 30ce7f2c28

* commit '30ce7f2c28512a53c845a23966fe55b75136feea':

Change-Id: I334ef180da8d9d799d258ec39291feec765780af
2016-06-01 21:11:46 +00:00
Benjamin Franz
042dd1cee6 Merge "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c
am: 8f79bc6c77

* commit '8f79bc6c7799e2edf3bc13cb82c0972ceeb5edab':
  Add an intent extra to force master clear

Change-Id: I4af0022ec5834d2669321d5c9c76956539c8ead7
2016-06-01 21:08:13 +00:00
Mady Mellor
75c6b59d32 Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 am: 8c475d5b0a" into nyc-mr1-dev-plus-aosp
am: 4da8883193

* commit '4da8883193682e4ea2242ec8e1408c6d8518f88b':
  Adds alpha to dimmed backgrounds

Change-Id: I3f107fc6a932d5f2d9009254697d46463a4ff453
2016-06-01 21:08:05 +00:00
Chen Xu
9fc5781531 Merge "Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 30680c6506" into nyc-mr1-dev-plus-aosp
am: 4ef21b0c1d

* commit '4ef21b0c1de641a2019997f58d91cdf6fea1853a':

Change-Id: If335a97678bf5fee0465389bad3aa8f9db3dc2d5
2016-06-01 21:06:18 +00:00
fionaxu
8882cf98b9 Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 36befb2dbc
am: d97994962d

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

Change-Id: I569bea23e9b867fa84c456accb7d24fd03853970
2016-06-01 21:02:33 +00:00
Dianne Hackborn
33b4773eec Merge "Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c am: 0e443c1320" into nyc-mr1-dev-plus-aosp
am: d032e5fad5

* commit 'd032e5fad56da20990061fd7136c405e801aa154':

Change-Id: I72ce8c62ea3878c3cebf6b09b289598da5b8c792
2016-06-01 21:02:15 +00: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
Dianne Hackborn
ff7e3c1f6e Merge "resolve merge conflicts of e174476 to master" 2016-06-01 20:50:10 +00:00
Julia Reynolds
f2f7bc0454 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: I59f9c9a74cf2beba8f14906820b65ae8d22ed8ce
2016-06-01 20:46:09 +00:00
Erik Wolsheimer
d7b9669b54 Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev 2016-06-01 20:39:46 +00:00
Wei Liu
35fc682390 Merge "Disable WiFi p2p service if it's not supported." 2016-06-01 20:38:15 +00:00
Muyuan Li
62e72f77a7 sysui: refactor for extension.
refactor status bar transition mode computation
logic into separate method.

Bug: 28942131
Change-Id: I5f46b6964ab431f009afcb9caf41e69e345090dd
(cherry picked from commit d8c64f23ea7020f9043a8e462b0903131560a875)
2016-06-01 20:38:08 +00:00
Doris Liu
68f749ce3c Correct valueType attribute for an AVD in test app
BUG: 29009391
Change-Id: Id2e43e538a5f8ab835957acc9164a40d319588c1
2016-06-01 13:38:03 -07:00
Julia Reynolds
6df8a9a89f Merge "Only call finish on operations that have started." into nyc-dev 2016-06-01 20:37:08 +00:00
Ta-wei Yen
c75b215eb3 Add support for source-specific VVM state in VoicemailContract
Negative values of the field CONFIGURATION_STATE, DATA_CHANNEL_STATE,
NOTIFICATION_CHANNEL_STATE is reserved to voicemail source for its'
specific errors. SOURCE_TYPE can be set to help interpret the error
codes.

Typically the OMTP visual voicemail source will set SOURCE_TYPE to the
same value of visual voicemail type set with 
CarrierConfigManager.KEY_VVM_TYPE_STRING, such as "vvm_type_omtp".

For example, the OMTP visual voicemail source could set 
CONFIGURAITON_STATE to -5 and SOURCE_TYPE to "vvm_type_foo", and the
client can find -5 for "vvm_type_foo" means "PIN is not set by the user"

+ Field SOURCE_TYPE
+ Docs to specify negative values are reserved for the source
- Removed hidden helper method SetStatus() and SetQuota(). The 'ignore'
  value is conflicting with reserved values.

Bug:26944391
Change-Id: I0930f684dadd25ae94e3ea68a7658c7ae423e3e3
2016-06-01 20:04:57 +00:00
Adrian Roos
06a49b1e93 Merge "Fix DirectReply bug when reapply fails" into nyc-dev
am: 6510bdeada

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

Change-Id: Ie8e1df9485816e4ae11f1de37d352efd466eafd2
2016-06-01 19:59:13 +00:00
Annie Chin
54c3213304 Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev 2016-06-01 19:52:23 +00:00
Chong Zhang
2ae97b4cf2 Merge "Do not sanitize override config for fullscreen" into nyc-dev
am: 65f1973ba9

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

Change-Id: I65d2c03274f8b78d9a041ff1306f33ee88b9942b
2016-06-01 19:47:30 +00:00
Adrian Roos
6510bdeada Merge "Fix DirectReply bug when reapply fails" into nyc-dev 2016-06-01 19:41:50 +00:00
Dianne Hackborn
7aaeb394a9 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: 61721ee3d7

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

Change-Id: Icbee904b90fe52afaa8074b3165e4618d1fae526
2016-06-01 19:37:43 +00:00
Dianne Hackborn
6f2181f251 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: I724497be1fca40530f4c7841cf1f5392b582ca4f
2016-06-01 19:36:46 +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
Selim Cinek
4f2264ed9d 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: Ia5ab8a7269eb3bfcb88bdfc98926bdbd0bff0af8
2016-06-01 19:15:29 +00:00
Vasco Brito
45fea4d6e9 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a
am: be718d8836

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

Change-Id: Ie1371d5dd1458038a2a2a93bba7c2e45f1d671ea
2016-06-01 19:14:29 +00:00
Evan Rosky
470baf3664 Merge "Allow showBouncer to be overridden in subclasses" 2016-06-01 19:10:48 +00: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
Dianne Hackborn
5101b95710 resolve merge conflicts of e174476 to master
Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f
2016-06-01 12:01:38 -07: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
Felipe Leme
d116e0fc14 Merge "Move DownloadsManager to permanent whitelist." into nyc-dev
am: 31e3b14d6a

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

Change-Id: Ia13db0b6db0995047353a9453d9132bcb4e9b34b
2016-06-01 18:59:23 +00: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
Jorim Jaggi
859465c105 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: I1f87d39822fe9a938b511a2b55fda2338311290e
2016-06-01 18:50:23 +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
86956c2f50 Merge "Check for null pointer before use." 2016-06-01 18:41:21 +00: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
65436b097a Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a
am: 28ed18877b

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

Change-Id: I784af12e3d721d4af9fa747e794677c17b7434f6
2016-06-01 18:36:44 +00:00