Commit Graph

3951 Commits

Author SHA1 Message Date
Sudheer Shanka
7e64e109cd Clear leftover state between resolving calls.
Because mOtherProfile variable was not cleared, we were directing
the user to the work intent resolved in the previous call, as well
as showing an extra item in the list.

Bug: 19070842
Change-Id: I48107c4914e7662d862ba4fe83368d65fc0c7966
2015-01-23 12:22:14 +00:00
Lorenzo Colitti
e871f0176d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
automerge: 6840ffa

* commit '6840ffae6761b369992fceb6b880cd9cd600b136':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:10:48 +00:00
Lorenzo Colitti
6840ffae67 am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
automerge: fbaf6b3

* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
2015-01-23 06:06:57 +00:00
Lorenzo Colitti
78d51c2292 Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456 Use the proper IpPrefix and LinkAddress constructors in VPN code.
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
2015-01-23 14:30:22 +09:00
Nicolas Prevot
8b5daa6be2 am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
automerge: 2cb240e

* commit '2cb240e083ddf8e700d04cae6d243d2aab4d65e4':
  Never set "Work" or "Personal apps" as prefered activities.
2015-01-22 10:37:56 +00:00
Nicolas Prevot
2cb240e083 am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
  Never set "Work" or "Personal apps" as prefered activities.
2015-01-22 10:32:30 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +00:00
Svetoslav
220dbc4a7f AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd automerge: 03944ce
automerge: 2b2b1a9

* commit '2b2b1a9b890f40fd24bce27580d3124c2c98f373':
  AlertActivity now behaves as a dialog for accessibility purposes.
2015-01-21 18:43:41 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
2015-01-21 18:39:34 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes.
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
2015-01-21 18:28:03 +00:00
Nicolas Prevot
daf92066db Never set "Work" or "Personal apps" as prefered activities.
In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
2015-01-21 17:53:11 +00:00
Kenny Guy
2e0072d730 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca automerge: 11c4cc1
automerge: 3458e18

* commit '3458e180cf1dab2be19d00758b64033061aa62d2':
  Only hide cross profile disclosure when showing resolver.
2015-01-21 16:30:22 +00:00
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
2015-01-21 16:24:01 +00:00
Narayan Kamath
e383132ac5 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265
automerge: ebc57c7

* commit 'ebc57c7471f1ebe56cae091707887be582b0db06':
  Choose the right executable for wrapped applications.
2015-01-21 14:13:27 +00:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
2015-01-21 14:09:33 +00:00
Kenny Guy
2b43c73e66 Only hide cross profile disclosure when showing resolver.
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
2015-01-20 19:27:38 +00:00
Narayan Kamath
37ad4b0242 Choose the right executable for wrapped applications.
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.

Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
2015-01-19 16:09:17 +00:00
Narayan Kamath
d6fe549b50 am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82':
  Remove support for --classpath and make --runtime-init the default.
2015-01-19 15:24:02 +00:00
Narayan Kamath
da1da678db am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '1f7d657b43fd7d40c402340c02ece5beb4b28c52':
  Fix handling of wrapped processes [part 1].
2015-01-19 15:23:57 +00:00
Narayan Kamath
66bbfb6b2c am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
  Remove support for --classpath and make --runtime-init the default.
2015-01-19 15:21:30 +00:00
Narayan Kamath
1f7d657b43 am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."
* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
  Fix handling of wrapped processes [part 1].
2015-01-19 15:16:58 +00:00
Narayan Kamath
f48029f00a Remove support for --classpath and make --runtime-init the default.
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.

Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.

Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
2015-01-19 15:04:58 +00:00
Narayan Kamath
6ac7e67168 Fix handling of wrapped processes [part 1].
Change 3fe595108f changed our pipe creation to CLOEXEC,
which doesn't work so well for wrapper processes that call exec.

Sending down the PID pre-exec won't work so well because wrappers
are arbitrary and might fork themselves before finally starting
the child application process.

Change-Id: I065f0f2150dc1ff04d2b2e8b25f06b4c754809b9
2015-01-19 14:17:49 +00:00
Narayan Kamath
2e139d5b4c am e05f269b: am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"
* commit 'e05f269bfe17065f5a3d291961700e2d9befc345':
  Fix handling of wrapped processes [part 2]
2015-01-19 10:20:54 +00:00
Narayan Kamath
e05f269bfe am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"
* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]
2015-01-19 10:15:32 +00:00
Narayan Kamath
23e68780be Fix handling of wrapped processes [part 2]
Drop privileges only if we're root. Zygote.preloadClasses can
be called from a non-root uid / gid in the case of wrapped classes,
so we shouldn't die from the resulting EPERM.

Change-Id: Ie3fbe50a17ec49bcbcb875c3a2ee1e1a3a62e88d
2015-01-16 17:40:35 +00:00
Alan Viverette
3c8e3a96e9 Merge "Add popup theme for Spinner, use for actionBarPopupTheme default" 2015-01-15 22:50:26 +00:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
2015-01-15 00:12:18 +01:00
Adrian Roos
4bc5b2bce9 Merge "LockPatternUtils clean up continued" 2015-01-14 22:32:08 +00:00
Adrian Roos
9dd16ebcf2 LockPatternUtils clean up continued
- Deprecate Settings.Secure.LOCK_PATTERN_ENABLED
- Remove unused permanent lock out
- Disallow empty/null arguments to saveLockPattern and saveLockPassword
- Refactor repeated quality checks

Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
2015-01-14 22:51:31 +01:00
Adrian Roos
dd6961d768 Merge "Explicitly specify user on LPU's private methods" 2015-01-14 20:49:13 +00:00
Adrian Roos
bb4bc22021 Merge "Directly dispatch USER_REMOVED to LockSettingsService" 2015-01-14 20:45:42 +00:00
Adrian Roos
0791e8fb30 Merge "Purge biometric weak and keyguard widgets" 2015-01-14 20:41:35 +00:00
Alan Viverette
b9ead4a915 Add popup theme for Spinner, use for actionBarPopupTheme default
Also adds methods for setting the context used to inflate drop-down
views in several adapters.

Bug: 17625714
Change-Id: Id267afa4901c1d46ceb3bc3b10fc642cea1799fe
2015-01-14 10:43:31 -08:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
2015-01-14 12:06:22 +00:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Wink Saville
54b1b1a07a StateMachine.dump produces no output sometimes.
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
2015-01-13 22:35:25 +00:00
Adam Powell
9a67d191ab am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev automerge: 57744dd
automerge: 1accc9c

* commit '1accc9c12ba9610bc592666c5f46be727f92e68d':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
2015-01-13 21:05:50 +00:00
Adam Powell
1accc9c12b am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
automerge: 57744dd

* commit '57744dd139f3d30ed1031319dd64b289a68ac3ba':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
2015-01-13 19:03:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Dianne Hackborn
1ed82edf1d am 2abf1f1c: Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e automerge: a319aa8
* commit '2abf1f1c212574ea7073584406ee86898f5d3779':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:21:25 +00:00
Dianne Hackborn
2abf1f1c21 Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e
automerge: a319aa8

* commit 'a319aa800df36d40e1de453b64fd1e14573e6d80':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:13:58 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Dianne Hackborn
adf1c93ff7 am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev automerge: 16e4324
* commit '3968820fc75e1eac03e54cba45b5a0adc28ee87d':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:55:28 +00:00
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:48:34 +00:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting...
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
2015-01-08 10:58:45 -08:00
Adrian Roos
dce0122ea2 Explicitly specify user on LPU's private methods
Also fixes a bug in DevicePolicyManagerService where
the wrong user was used.

Bug: 18931518
Change-Id: I7ae8ecfdb1c835cdee7eafa2b96e1ec8b712977b
2015-01-08 13:53:52 +01:00
Adam Powell
b6ab098bad Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
Add API for handling nested pre-processing of accessibility events
similar to nested pre-scroll or pre-fling. This allows custom views to
delegate a nested scroll to a parent via the accessibility system.

Use this functionality to allow opening the ResolverDrawerLayout via
accessibility commands.

Bug 18827274

Change-Id: Icd5a502605b78a861bb03e7b11923841a72eb9ab
2015-01-07 17:00:12 -08:00