Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,340 Commits 3 Branches 0 Tags
2706cb804a4e2d52b671a560f65108cf2ebbcd6d
Commit Graph

6139 Commits

Author SHA1 Message Date
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
John Spurlock
97abe5040a am a2decb0e: am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'a2decb0e4d50c68391b82e7acf6c425df2f30dd6':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:09:18 +00:00
Amit Mahajan
65940c4ceb am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:02:28 +00:00
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
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
chh
1d5f99b973 am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:57:42 +00:00
Chih-hung Hsieh
9138ebe547 am b3086668: am 6cc39a47: am 613d2066: Merge "Fix unused variables." 
* commit 'b30866681475aff8fd23841dbadf1d39e0001e20':
  Fix unused variables.
 2014-11-25 19:57:33 +00:00
Chih-hung Hsieh
46a38b3abd am 0551ae80: am 73780ac3: am 38cc84de: Merge "Remove unused variable" 
* commit '0551ae80ebc0ce078826d4ab48bcb076b3523651':
  Remove unused variable
 2014-11-25 19:57:28 +00:00
Chih-Hung Hsieh
68d228c75e am f1420329: am a3b1ea33: am e57b3991: Merge "Remove unused function" 
* commit 'f14203295bb39c8d12a20a0e62289b4623dd1e97':
  Remove unused function
 2014-11-25 19:56:41 +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
8f70a2558b am ffc71028: am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit 'ffc710281c38aba9546d200a25d6b19b0f85470a':
  Define permission for system apps to query size of block
 2014-11-25 18:51:42 +00:00
Alan Viverette
37edd7d673 am bf7ef378: am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit 'bf7ef378980a7d5b9b231d6e75a70923e83eed8c':
  Update IME selection dialog layout for Material
 2014-11-25 18:51:06 +00:00
Tom Taylor
2afde42d61 am 0b7a212f: am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit '0b7a212f6a405ff0036d8df258401b75fc4eb81e':
  Issues with messaging apps on non-primary user account
 2014-11-25 18:50:43 +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
642b478635 am 278dfdf7: am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '278dfdf73142e72944478e50a3f02d3b5c6fd370':
  Ignore spammy package logs when dumping.
 2014-11-25 17:56:01 +00:00
Jeff Davidson
633fffbff5 am 476d5a26: am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '476d5a265bae7c638d83fc59037a885065e344a4':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:55:43 +00:00
Jinsuk Kim
d7a7d6f68c am 4043fd8f: am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit '4043fd8fec7e7f507851715138d705a8fdfe9e90':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:55:39 +00: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
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Chris Wren
827b5537f1 am dd8de0a7: am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit 'dd8de0a7b668bce9193acae290e30e118ec98c69':
  LED should not be blocked by interruption filtering.
 2014-11-25 17:49:10 +00:00
Paul Jensen
0add9b8195 am d5ffce76: am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit 'd5ffce76fb16d181e3cf313255c336c4ce6ee591':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-25 17:48:56 +00:00
Dianne Hackborn
039777e792 am 9fafd0c7: am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '9fafd0c7111f0d0df431f6c0a4f4f5afcdea7b81':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:48:24 +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
10fd39001c am 1cb0044e: am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '1cb0044ece9e3db6ca631daff7d225ce60b67f40':
  Delete unused/non-working code.
 2014-11-25 15:16:10 +00:00
Sreeram Ramachandran
b3e20899fe am 19f47022: am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '19f47022e0c89a11ef03c158d19fa294168da360':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:16:05 +00:00
Sreeram Ramachandran
053ebdb4ea am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'ca7b07072849fa2e4bf4e074ce1366eb7138befc':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:16:00 +00:00
Adrian Roos
bc80d9586d am df3be538: am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 
* commit 'df3be538e0a3a5b0a248f36f2fcb4b190a3534f0':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-25 15:15:40 +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
cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users
 2014-11-25 15:04:28 +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