5476 Commits

Author SHA1 Message Date
John Spurlock
a2decb0e4d am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
* commit 'f74ae93cac3c78762fc87cdaa9edd6f86f2dbec8':
  VolumeZen: Introduce internal vs external ringer mode.
2014-11-26 12:01:35 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
2014-11-25 19:04:05 +00:00
Chih-hung Hsieh
b308666814 am 6cc39a47: am 613d2066: Merge "Fix unused variables."
* commit '6cc39a475dd8eaac04438b393559612ff7cd840f':
  Fix unused variables.
2014-11-25 19:03:50 +00:00
Chih-hung Hsieh
0551ae80eb am 73780ac3: am 38cc84de: Merge "Remove unused variable"
* commit '73780ac3921c26853eb132296144b85461c80e31':
  Remove unused variable
2014-11-25 19:03:18 +00:00
Chih-Hung Hsieh
f14203295b am a3b1ea33: am e57b3991: Merge "Remove unused function"
* commit 'a3b1ea33368b72209f72ad21b512b1c755ce05aa':
  Remove unused function
2014-11-25 18:52:20 +00:00
Andres Morales
ffc710281c am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev
* commit '83f4847f7b842fafec74fad85878e36b19dfef9f':
  Define permission for system apps to query size of block
2014-11-25 18:46:15 +00:00
John Spurlock
f74ae93cac am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev
* commit 'bc6f59a1ef341231c2b57e0cde691be1a5a32203':
  VolumeZen: Introduce internal vs external ringer mode.
2014-11-25 18:45:23 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
2014-11-25 18:44:42 +00:00
Tom Taylor
0b7a212f6a am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev
* commit 'bd3b00004c5aab43de0632994aa9a9d4e701ad5e':
  Issues with messaging apps on non-primary user account
2014-11-25 18:43:56 +00:00
John Spurlock
bc6f59a1ef Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 2014-11-25 18:40:55 +00:00
John Spurlock
661f2cf458 VolumeZen: Introduce internal vs external ringer mode.
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
 - Internal ringer mode: Used for underlying stream muting
 - External ringer mode: Reported to clients

The mapping between external ringer mode + zen is:
 - normal = all
 - vibrate = all
 - silent = priority (read-write) or none (read)

Changes include:
 - Remove "zen check" from audio service, back to audio
   service having no knowledge of zen.
 - Maintain a new external ringer mode in audio service,
   this is the ringer mode reported through AudioManager
   to callers, also mapped to the change intent.
 - Introduce a "ringer mode delegate" to the local
   audio manager interface, responsible for observing
   external / internal mode changes, and making changes
   if necessary.
 - Internal ringer mode changes are still interesting
   to the volume dialog, wire up a callback through
   the existing IVolumeController interface.
 - On devices without vibration, the mapping is the same
   but since no ringer mode change is possible, disable
   the icon toggle and remove the mute icon when volume=0.
 - On devices with vibration, volume down presses should
   pulse the vibrate icon (and vibrate) as a hint that this
   is as low as the device can go using the keys.  Since
   the mechanics are similar to the existing zen=none hint,
   pull into shared helper.
 - Log ringer mode changes to the zen log, include calling
   package information for issue diagnosis.
 - Include whether vibration is supported in the audio service
   dump.
 - Update the status bar icon policy to use the internal ringer
   mode, not the external mode (for vibrate icon).
 - Update the "Muted by <x>" logic, include current suppressor
   in dumpsys, ensure suppression icon is enabled & !clickable,
   regardless of zen mode.

Bug: 17884168
Bug: 15471679
Bug: 16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
2014-11-25 13:20:46 -05:00
Jeff Sharkey
278dfdf731 am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev
* commit '117c549b86979d891edfe1d810ac087609928386':
  Ignore spammy package logs when dumping.
2014-11-25 17:50:12 +00:00
Jeff Davidson
476d5a265b am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
  Don't enforce control permission when preparing consented VPN.
2014-11-25 17:49:39 +00:00
Jinsuk Kim
4043fd8fec am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
* commit 'c27f5baaeb39137b7cedc7c36feaaa1a67b1d3a3':
  CEC: Do not issue non-effective <Routing Change>
2014-11-25 17:49:34 +00:00
Andres Morales
83f4847f7b am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev
* commit '59093d925decaf6ddf2e952de25e3cdd1b492d81':
  Define permission for system apps to query size of block
2014-11-25 17:41:30 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
2014-11-25 17:39:16 +00:00
Chris Wren
dd8de0a7b6 am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
* commit 'fa5768cef416d6379cd2a9e687695591add3f8b5':
  LED should not be blocked by interruption filtering.
2014-11-25 17:38:21 +00:00
Paul Jensen
d5ffce76fb am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev
* commit '080b02fc6c4531646d29ff4039080f2ac6d5f31a':
  Don't bother validating networks that don't satisfy the default request.
2014-11-25 17:37:54 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
2014-11-25 17:36:52 +00:00
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Andres Morales
6b0c7acd7f Define permission for system apps to query size of block
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.

Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.

Bug: 18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
2014-11-25 15:55:28 +00:00
Sreeram Ramachandran
1cb0044ece am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev
* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.
2014-11-25 15:10:20 +00:00
Sreeram Ramachandran
19f47022e0 am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
* commit '4096a3107b070339ba06102a32a368f28a31f9a4':
  Allow VPNs to specify their underlying networks.
2014-11-25 15:10:14 +00:00
Sreeram Ramachandran
ca7b070728 am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.
2014-11-25 15:10:08 +00:00
Adrian Roos
df3be538e0 am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
* commit '9b4b2940b7697e626200a7ab82fbfa3bf99174fc':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-25 15:09:33 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
2014-11-25 15:34:56 +01:00
Alan Viverette
0e8aabd6c9 am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev
* commit '662039c68768890d4f5a818067542be51e89255c':
  Update IME selection dialog layout for Material
2014-11-25 00:56:10 +00:00
Alan Viverette
662039c687 Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 2014-11-25 00:53:43 +00:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
Bernhard Rosenkränzer
9c1c90e92e Fix unused variables.
The return value of jniRegisterNativeMethods is checked only in
LOG_FATAL_IF, which defines to nothing in the LOG_NDEBUG
case.

Fake a use of the 'res' variable to shut off warnings when LOG_NDEBUG.

Change-Id: I8263610f327c56897f76796fe1fbc2b325b0559f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 15:42:11 -08:00
Alan Viverette
505e3abb8d Update IME selection dialog layout for Material
Also cleans up simple_list_item_2.xml formatting.

BUG: 18314215
Change-Id: I12b6ff19fca891524da7137b85dd576f85ee266a
2014-11-24 15:22:11 -08:00
Tom Taylor
bd3b00004c am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev
* commit '4cd3e47e584fb1508db8f0e559f1167ab07c68c3':
  Issues with messaging apps on non-primary user account
2014-11-24 23:20:11 +00:00
Tom Taylor
4cd3e47e58 Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 2014-11-24 23:14:42 +00:00
Jeff Sharkey
117c549b86 am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev
* commit '0f667f5855bff7432002dba2ef0d393fe2ad955f':
  Ignore spammy package logs when dumping.
2014-11-24 22:26:10 +00:00
Jeff Sharkey
0f667f5855 Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 2014-11-24 22:21:27 +00:00
Chih-hung Hsieh
38cc84dece Merge "Remove unused variable" 2014-11-24 22:15:42 +00:00
Jeff Sharkey
962bd4a691 Ignore spammy package logs when dumping.
Bug: 18390552
Change-Id: Ie333f57d46d6ab3f4b9daa17f98b1e94a236e959
2014-11-24 13:43:45 -08:00
Jeff Davidson
6fdf2a1709 am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '6ea4e11d9817d85eb5c0ff445154985e4eb0c534':
  Don't enforce control permission when preparing consented VPN.
2014-11-24 21:25:41 +00:00
Jinsuk Kim
c27f5baaeb am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
* commit '51cb7aa774cf6ab7727928d136052c61325a8031':
  CEC: Do not issue non-effective <Routing Change>
2014-11-24 21:21:12 +00:00
Jeff Davidson
6ea4e11d98 Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev 2014-11-24 21:19:56 +00:00
Jinsuk Kim
51cb7aa774 Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 2014-11-24 21:14:02 +00:00
Jeff Sharkey
58b699c366 am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '636baa0d2451a531f8e83f5cdfc0d709989c4862':
  Introduce revision codes for split APKs.
2014-11-24 20:20:10 +00:00
Jeff Sharkey
636baa0d24 Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 2014-11-24 20:16:17 +00:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
2014-11-24 12:13:11 -08:00
Chris Wren
fa5768cef4 am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
* commit '1b26cc5b7ab5733b94741f17c84eb4b140eaf045':
  LED should not be blocked by interruption filtering.
2014-11-24 20:00:55 +00:00
Chih-Hung Hsieh
70363cc576 Remove unused function
Remove an unused static function clang complains about

Change-Id: Id5875960e9f93348c7a3a912f42b5f457af2cdc0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 11:52:43 -08:00
Chris Wren
1b26cc5b7a Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 2014-11-24 19:15:49 +00:00
Paul Jensen
080b02fc6c am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev
* commit 'e57064a289082758fcb9bb71f987dde84931e3e6':
  Don't bother validating networks that don't satisfy the default request.
2014-11-24 18:36:27 +00:00
Paul Jensen
e57064a289 Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev 2014-11-24 18:30:36 +00:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +00:00