drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,418 Commits 1 Branch 0 Tags
Commit Graph

21478 Commits

Author SHA1 Message Date
Amith Yamasani
50207f043f am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit '3e732ab2050507dbfde23ee0d050daae86d9d8bc':
  Use the correct method to check if device is encrypted
 2014-10-17 20:28:41 +00:00
Jim Miller
c8bd2a7efc am 0e534383: am a6b7c5a7: am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '0e5343833f74e2019f2466f0f854a99e9226279b':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 19:11:36 +00:00
Amith Yamasani
e1970346a4 am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted
 2014-10-17 19:05:25 +00:00
Amith Yamasani
b5afeca3d9 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 19:00:36 +00:00
Jim Miller
a6b7c5a7b1 am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '4142d9b01d6485afddf7567f1da9959361d6a687':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 18:53:01 +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
4142d9b01d am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 
* commit '7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
  Fix getStorageEncryptionStatus() in DevicePolicyManager
 2014-10-17 09:34:37 +00:00
Jim Miller
7d96dc6d98 Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev 2014-10-17 09:31:04 +00:00
Christopher Tate
29cef75ddf am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev automerge: 11bac0e 
automerge: ed1e999

* commit 'ed1e999cb71f3af51ee96a6ed8ac3f3b031e1968':
  Eliminate race condition around backup completion + resumption
 2014-10-17 01:17:13 +00:00
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
be8d287533 Merge "telephony re-registry error" into lmp-mr1-dev automerge: efdddef 
automerge: 094c313

* commit '094c3136690d9d75b151666aad65a7f77d731e8a':
  telephony re-registry error
 2014-10-16 23:52:56 +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
420aec8a38 am 67b086f9: am b08ee9b7: am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '67b086f9f16de57b2680966feaa60156a33135a5':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:17:25 +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
bda26b3b01 am e1d07b9e: am 50fcdf9d: am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 
* commit 'e1d07b9eba96c420261969a01e59968f0a423bfe':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
 2014-10-16 20:37:29 +00: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
eec22a1c24 am 216d08ff: am 0ee1d87c: am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit '216d08ffd548d056101af14af4634f4d796cec51':
  Send accessibility events with no window.
 2014-10-16 19:56:04 +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
0db099ca30 am 591485df: am e43110ac: am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '591485df659a3c804945da265dcee63fd8b64d8a':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
 2014-10-16 19:17:12 +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
Lorenzo Colitti
0afed57e60 am dc14068a: am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev 
* commit 'dc14068a7df03b996de2054cf0579d506331caaa':
  Allow root and system to bypass the always-on VPN firewall rules
 2014-10-16 18:45:23 +00:00
Lorenzo Colitti
5b72efd078 am b7ba3e21: am 94dbc64c: am ffd73350: am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev 
* commit 'b7ba3e21e2a92ce8778045b6fe8b1cddc477215a':
  Don't make lockdown VPN source firewall rules over-broad.
 2014-10-16 18:45:18 +00:00
Lorenzo Colitti
80f8c02eb2 am 03c0c785: am 5fa2929f: am 24f9a26c: am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev 
* commit '03c0c78575c59bb33ca4b5eb1eb20ddf886efa11':
  Propagate network state changes to the LockdownVpnTracker.
 2014-10-16 18:45:13 +00:00
Christopher Tate
c49b6b4b20 am d1ec1c47: am 31e4eeb2: am ce39d25f: am 185fcadf: Merge "Fix spurious restore session timeouts" into lmp-dev 
* commit 'd1ec1c47154b96cd123219615480809ce0072b69':
  Fix spurious restore session timeouts
 2014-10-16 18:45:08 +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
e341572ecb am 45e0baf3: am 49bb8cdc: am d1a58c45: am 5d460b88: Merge "Remove unnecessary logging." into lmp-dev 
* commit '45e0baf333c7015456f610631e4fa11d54345aa4':
  Remove unnecessary logging.
 2014-10-16 06:55:08 +00:00
Craig Mautner
215e2b0f4b am 2ecd9de2: am d1bba16d: am 87441860: am e5279105: Merge "Move desired task to top if not already there." into lmp-dev 
* commit '2ecd9de2d5c43101fe86f9479710bab99bf9f3d6':
  Move desired task to top if not already there.
 2014-10-16 06:54:57 +00:00
John Spurlock
d20db2832e am c824a9d4: am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'c824a9d444bf3a7df5f9003bd839fd609130be9e':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:54:52 +00:00
RoboErik
a56d6c3192 am 5e1b92c0: am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit '5e1b92c054551708c8652530830f859613d666e4':
  Don't call size on a null metadata
 2014-10-16 06:54:42 +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