20643 Commits

Author SHA1 Message Date
Christopher Tate
11bac0ed21 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev
* commit '61737d81a2e0a2cc327210bf771239655f62c3d9':
  Eliminate race condition around backup completion + resumption
2014-10-17 00:05:22 +00:00
xinhe
efdddefaf5 Merge "telephony re-registry error" into lmp-mr1-dev 2014-10-16 22:37:45 +00:00
xinhe
75c2c159eb telephony re-registry error
telephony re-registry do not update the callback and other parameter

Bug:17920733

Change-Id: I288e8b9a6747fc3c5c4794553435b29b49d379f0
2014-10-16 21:54:38 +00:00
Christopher Tate
61737d81a2 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:30:39 +00:00
Chenjie Luo
b08ee9b728 am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '76ed803fbd3d7be015cc25f521b73a9436c14fdb':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
2014-10-16 21:05:51 +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
Chenjie Luo
2cab8825b3 Add system property config.disable_networktime to configure NetworkTimeUpdateService
Bug: 17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020
2014-10-16 13:33:25 -07:00
Chenjie Luo
50fcdf9d46 am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev
* commit 'fe09db1e0d5af46e7b643c37ba52f62500b7f043':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
2014-10-16 20:28:02 +00:00
Chenjie Luo
fe09db1e0d Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 2014-10-16 20:23:10 +00:00
Chenjie Luo
d25e4efdc1 Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.

Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68
2014-10-16 20:22:24 +00:00
Svet Ganov
0ee1d87c38 am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev
* commit '515f14d4659626ebf8381a5cc2d6a44063d30b42':
  Send accessibility events with no window.
2014-10-16 19:47:27 +00:00
Svet Ganov
515f14d465 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:15 +00:00
Chenjie Luo
e43110ac84 am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev
* commit '8fac66821cc12104999bb87c900abff659160a44':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
2014-10-16 19:01:30 +00:00
Chenjie Luo
c597c55ffe Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
Bug: 17934875
Change-Id: Ic1acff13190f38cedb1ecf22783d4dfd3373511d
2014-10-16 11:36:31 -07:00
Lorenzo Colitti
e526668eae am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev
* commit 'd04d6c91a311af7a52f05fac5935c9327a990046':
  Allow root and system to bypass the always-on VPN firewall rules
2014-10-16 18:35:21 +00:00
Lorenzo Colitti
94dbc64c98 am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev
* commit 'ffd7335088d228ac0c56fdc7e2faba79c78572bf':
  Don't make lockdown VPN source firewall rules over-broad.
2014-10-16 18:35:18 +00:00
Lorenzo Colitti
5fa2929f16 am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev
* commit '24f9a26cea200d9452bd922d94f8669d87744f53':
  Propagate network state changes to the LockdownVpnTracker.
2014-10-16 18:35:14 +00:00
Christopher Tate
31e4eeb26f am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit 'ce39d25f2c5908c3f6067a70b2ab504929e2eb5f':
  Fix spurious restore session timeouts
2014-10-16 18:34:56 +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
d04d6c91a3 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:23:24 +00:00
Lorenzo Colitti
ffd7335088 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:23:21 +00:00
Lorenzo Colitti
24f9a26cea 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:23:17 +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
Craig Mautner
49bb8cdc5e am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit 'd1a58c45fee09c5e599fe173d5055546fe147b03':
  Remove unnecessary logging.
2014-10-16 05:51:56 +00:00
Craig Mautner
d1bba16da5 am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev
* commit '87441860bf4df2da7ce4537ad31c8240547da655':
  Move desired task to top if not already there.
2014-10-16 05:51:48 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
2014-10-16 05:51:45 +00:00
RoboErik
56d8876f4b am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev
* commit '0dfd86e00656573cdd3e28742e93319c96f6ce15':
  Don't call size on a null metadata
2014-10-16 05:51:37 +00:00
Christopher Tate
ce39d25f2c am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev
* commit '185fcadf898f0fe41461a632177dfd0d7e5dfb70':
  Fix spurious restore session timeouts
2014-10-16 03:36:34 +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
d1a58c45fe am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev
* commit '5d460b88715c8a902eb3930e690ddd1b8d84338f':
  Remove unnecessary logging.
2014-10-15 23:40:54 +00:00
Craig Mautner
87441860bf 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:40:11 +00:00
John Spurlock
3d4aec1bb7 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:40:07 +00:00
RoboErik
0dfd86e006 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:39:29 +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
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
5c8cafa614 am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
  Fix admin policies in managed profiles
2014-10-15 17:54:34 +00:00
Amith Yamasani
01ddc75fc1 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
2014-10-15 17:49:19 +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
2df7628591 am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '203ed4db9656cc3047c65e12e3969d21652d4ccf':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:58:49 +00:00
Jeff Sharkey
203ed4db96 am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
2014-10-15 16:53:09 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00