Commit Graph

4445 Commits

Author SHA1 Message Date
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
2014-11-26 12:08:47 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Jinsuk Kim
3052fede88 am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev
* commit '1c72ba8ac3036e16a58cd1fd50c7cb01804e993e':
  CEC: Do not compare active input when updating
2014-11-26 06:02:36 +00:00
Jinsuk Kim
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +00:00
Dianne Hackborn
b3cf1136d0 am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev
* commit '4298db73cecf81cd896b0460c69dbaa727b22514':
  Re-tune low memory killer params.
2014-11-26 01:55:16 +00:00
Dianne Hackborn
4298db73ce Merge "Re-tune low memory killer params." into lmp-mr1-dev 2014-11-26 01:44:22 +00:00
Dianne Hackborn
824aeab2db Re-tune low memory killer params.
Drop the minimums back down to their old values.

Revert what I think was a mistake in bumping up the last two
maximums to the same value as was being forced for 64 bit.

Smarten the 64 bit adjustment to be relative to the values picked,
rather than hard-coded.

Change-Id: Ibee9625073469ad4722a1b6684c9fb2b9f0a4681
2014-11-25 17:26:36 -08:00
Amit Mahajan
476520f744 am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
* commit '3749541a206390054b22d5f5bddc1b43f348f433':
  Adding helper functions to retrieve settings that are stored per subId.
2014-11-25 20:45:04 +00:00
Amit Mahajan
3749541a20 Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 2014-11-25 20:39:09 +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
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
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
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
Jinsuk Kim
449c019f22 CEC: Do not compare active input when updating
A recent change sets the active path ahead of calling
updateActiveInput. Removes the check between new and active
path as it is always successful thus stops the flow.

Bug: 18506537
Change-Id: I29471ffc6194baa1fad62063f1d192caa9000afd
2014-11-25 15:01:56 +09: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
Amit Mahajan
421a53900d Adding helper functions to retrieve settings that are stored per subId.
Bug: 18392680
Change-Id: I360bc19c4501020afd9dfa1cfb7e66ce2fad9536
2014-11-24 15:57:41 -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
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
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
Dianne Hackborn
608439df38 am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
  Work on issue #18486438: Reduce size of bugreport output
2014-11-24 17:59:43 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Tom Taylor
86201db27e Issues with messaging apps on non-primary user account
Bug 18399514

Adjust the contentUri to contain the caller's userId so that when
the phone process tries to open the Uri, it will open the provider
on the correct user.
Also make sure the Uri grants are properly qualified. We only need to grant
permission for sending. Receiving an MMS is always done by the primary
user and doesn't need special permissions. Move various permission grants
from the SmsManager to here.

Change-Id: Ib192f651ab05db9f07e9e6245bb343ed7a55b18e
2014-11-24 09:36:43 -08:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
2014-11-24 17:28:09 +00:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Paul Jensen
71b645fe9c Don't let NetworkMonitor state stop user-initiated transitions.
GCM can call reportInetCondition() at any time which can cause
the NetworkMonitor to transition states to reevaluate at any time.
Previously we were only listening for users clicking the sign-in
notificaiton or completing sign-in when in the appropriate state.
With this change NetworkMonitor's state does not stop us from
listening for the user's actions.

bug:17917929
Change-Id: Ic1da31d90f7090e5fc111874cb7c37d505aaf590
2014-11-24 11:11:32 -05:00
Adrian Roos
9b4b2940b7 am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
* commit '07361c8488aa600573c21e27f728c22d44760ecf':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-24 16:08:36 +00:00
Adrian Roos
07361c8488 Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 2014-11-24 16:03:43 +00:00
Chris Wren
ce00a234ed LED should not be blocked by interruption filtering.
Bug: 17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
2014-11-24 10:53:46 -05:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
2014-11-24 11:57:59 +00:00