21198 Commits

Author SHA1 Message Date
Elliott Hughes
b6e004261c am c8dce896: Merge "Fix not to show a log with empty default ime"
* commit 'c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
  Fix not to show a log with empty default ime
2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a Fix not to show a log with empty default ime
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
2014-10-30 09:22:17 +09:00
Andreas Gampe
dfdc6acc48 resolved conflicts for merge of 3c8cf51f into stage-aosp-master
Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
2014-10-28 20:42:53 -07:00
Narayan Kamath
c273edbba5 Stop using apache http to download Gps XTRA data.
Also, general cleanup of unused parameters.

Change-Id: Iebd1aa05de9cd676b0b6d08c99df8c15b8e8473c
2014-10-24 13:41:27 +01:00
tingna_sung
27d2ea2242 Doesn't re-sort app windows when move task to top
To avoid app window isn't moved by new task order when move task to top

Change-Id: I5f8a901bb2f20a163b7fa0a59d1dc58c1fca5f1f
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-10-22 11:58:06 +08:00
tingna_sung
9dde78f7da Avoid to skip app window due to un-assigned sending to bottom state while app window sort
should assign value of WindowToken.sendingToBottom according to the state of this token is moved to top or bottom
to avoid app window is skiped incorrectly due to sending to bottom state is un-assigned while app window sort
and finding focus window.

Change-Id: I190838d1d01ca229155d5176930178ab41335556
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-10-22 00:07:08 +08:00
Kristian Monsen
a15a75f32d am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
* commit '5d6041813283086c5a290ad6ca07e05b1a6ffc14':
  Let TYPE_ANNOUNCEMENT be sent from any window
2014-10-17 23:56:57 +00:00
Kristian Monsen
5d60418132 Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 2014-10-17 23:54:01 +00:00
Svetoslav
5ee758932a am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
2014-10-17 23:04:13 +00:00
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption.
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
2014-10-17 14:33:11 -07:00
Kristian Monsen
ba3787d849 Let TYPE_ANNOUNCEMENT be sent from any window
Part of fix for bug 17905712

Change-Id: I4e4b09f6b6342a27744e42984d483ef8de18fbff
2014-10-17 14:13:07 -07:00
Amith Yamasani
3de84d0de6 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
2014-10-17 18:58:58 +00:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
2014-10-17 11:43:57 -07:00
Jim Miller
f85be7172b am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
2014-10-17 09:35:06 +00:00
Jim Miller
7d96dc6d98 Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 2014-10-17 09:31:04 +00:00
Dan Albert
692018430f Clean up unused parameter warnings.
Change-Id: Ifbf310a0c10bd6afc3099bcad1026990bd1e6a22
2014-10-16 16:55:29 -07:00
Christopher Tate
7a03241199 am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption
2014-10-16 21:31:54 +00:00
Christopher Tate
a28b5c5160 Eliminate race condition around backup completion + resumption
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
2014-10-16 13:56:45 -07:00
Svet Ganov
25129a3975 am b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.
2014-10-16 19:40:16 +00:00
Svet Ganov
d5b0842a1d Send accessibility events with no window.
An app can send an accessibility event by calling the send methods
on view or directly asking the accessibility manager to do that.
While the recommened way to send such events is calling the methods
on view a legacy app or app whose developer did not read the docs
carefully may be calling the accessibility manager APIs directly.
In such a case the event does not have assigned window id and does
not get send. Since events fired by using the accessibility manager
directly lack context to determine whether thier source is important
for accessibility we assume they come from an important view to
avoid breaking backwards compatibility.

bug:18001711

Change-Id: Ie1c298fa5a0670cbeaedfcd64f820961c296b6ca
2014-10-16 17:31:52 +00:00
Lorenzo Colitti
04c2e47b0d am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit 'b7d8514822aefbf8274f5464dc12cee151e2b78b':
  Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 09:22:52 +00:00
Lorenzo Colitti
717bcc2723 am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit '917c547beb9adecf2e7d2b355e85e37c2557c5d3':
  Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 09:22:47 +00:00
Lorenzo Colitti
1b9e12f9a0 am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 09:22:42 +00:00
Lorenzo Colitti
b7d8514822 Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 2014-10-16 08:46:10 +00:00
Lorenzo Colitti
917c547beb Merge "Don't make lockdown VPN source firewall rules over-broad." into lmp-dev 2014-10-16 08:45:03 +00:00
Lorenzo Colitti
28dcf0345b Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 2014-10-16 08:37:28 +00:00
Christopher Tate
e62b49f86b am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts
2014-10-16 03:33:46 +00:00
Christopher Tate
0f32717a17 Fix spurious restore session timeouts
The restore-session idle timeout should not be ticking while we're
doing legitimate restore work.  We now explicitly stop the timeout
ticker [a delayed message on our handler thread] whenever we undertake
a valid restore operation.  The timer is already correctly resumed
when restore operations conclude.

(In practice we need to suspend the timeout tracking at exactly those
times when we're entering the wakelock-protected restore flow.  The
timeout is reestablished when the wakelock is released; this part
is already in the code.)

Bug 17990544

Change-Id: I7318020ce30fd9c35bc3a644f8c101fd3d063c8b
2014-10-16 01:34:01 +00:00
Craig Mautner
d01a814c89 am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
2014-10-15 23:58:29 +00:00
Craig Mautner
f11e1bb9a4 am e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit 'e52791055c855a957cad767dfa9889faae86660c':
  Move desired task to top if not already there.
2014-10-15 23:57:55 +00:00
John Spurlock
67541eada7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
2014-10-15 23:57:50 +00:00
RoboErik
d7f699421e am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
2014-10-15 23:57:11 +00:00
Craig Mautner
5d460b8871 Merge "Remove unnecessary logging." into lmp-dev 2014-10-15 21:48:52 +00:00
Craig Mautner
3d7485c172 Remove unnecessary logging.
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
2014-10-15 14:30:02 -07:00
Craig Mautner
e52791055c Merge "Move desired task to top if not already there." into lmp-dev 2014-10-15 21:13:58 +00:00
Craig Mautner
737fae2b2e Move desired task to top if not already there.
Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.

This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.

Also make activity dump ordering consistent.

Fixes bug 17721767.

Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
2014-10-15 14:11:23 -07:00
John Spurlock
b2344c81bc Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 2014-10-15 21:04:33 +00:00
Jim Miller
3836c9a4c1 Fix getStorageEncryptionStatus() in DevicePolicyManager
This fixes a bug introduced by a change where the function
ignores systems with default encryption where it's disabled.

The fix also checks to see if vold thinks the device is secure.

Fixes bug 17881324

Change-Id: I2c40f76cf990d90d1a825955aa3b080b21684426
2014-10-15 13:15:52 -07:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
RoboErik
421c9df7ff Don't call size on a null metadata
bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
2014-10-15 12:17:43 -07:00
Amith Yamasani
54be1ea752 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
2014-10-15 17:48:50 +00:00
Amith Yamasani
2c3886cb34 Merge "Fix admin policies in managed profiles" into lmp-dev 2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259 Fix admin policies in managed profiles
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
2014-10-15 10:42:17 -07:00
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
2014-10-15 13:32:31 -04:00
Jeff Sharkey
96b46ebaee am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:28 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00
Chih-Hung Hsieh
e07c9f140e Fix log call output format error. (DO NOT MERGE)
Cherry picked from googleplex-android c/445200.

BUG: 17916851
Change-Id: If4077e94d6dc7ef31ecf09cbcf41091c7e30268f
2014-10-15 16:48:22 +00:00
Jeff Sharkey
97d47ed036 Reduce PackageInstaller Binder memory pressure.
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions.  To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
2014-10-15 09:19:54 -07:00
Lorenzo Colitti
ad4cd0c019 Allow root and system to bypass the always-on VPN firewall rules
This is needed to allow the always-on VPN to survive network
switches. In L, network switches are graceful, and in order to
switch to a network, the system first has to validate it using
DNS requests (from netd, running as root) and HTTP requests
(from NetworkMonitor, running inside the system_server).

This should also allow always-on VPN to work on networks like
T-Mobile that use 464xlat, fixing a bug that has been present
since K.

Bug: 9597277
Bug: 17695048
Change-Id: I0daa5707f2139339f9ececde0e73aac3bf23fdc3
2014-10-16 01:16:50 +09:00