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

20668 Commits

Author SHA1 Message Date
Griff Hazen
6e1eb1c966 am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit 'aec92e2eca4b4197ac45dcde265e2797c7ea9133':
  Disable zen log printouts by default
 2014-10-20 21:46:12 +00:00
Griff Hazen
1aad144c8f Disable zen log printouts by default 
Bug: 18056528
Change-Id: I77359476ff2f67027383fcdb91d2843d040533c7
 2014-10-20 14:02:59 -07:00
John Spurlock
3babc728e0 Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 2014-10-20 20:15:38 +00:00
John Spurlock
9b84309bea Qualify private outer call in MediaProjectionManagerService. 
Change-Id: Ia4e09bdfe773a27107c0980a1aabf9b09e2b0a46
 2014-10-20 13:37:48 -04:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Yuncheol Heo
0608b9328b CEC: Add a callback for vendor when HDMI control setting is changed. 
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
  distinguish whether the message is broadcast or not.

Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
 2014-10-20 16:47:24 +09:00
Jinsuk Kim
7a78e578d7 Merge "CEC: add getDeviceList()" into lmp-mr1-dev 2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74 CEC: add getDeviceList() 
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.

For this, turned the local device address list to unmodifiable so that it can
be used by any threads.

Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.

Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
 2014-10-20 11:32:47 +09:00
Dianne Hackborn
ed512c817c Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 2014-10-18 00:42:24 +00:00
Kristian Monsen
f247b90864 am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit '4183a2fc83369996499dfffcfb4113cb6b506165':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-18 00:03:06 +00:00
Kristian Monsen
4183a2fc83 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:57:18 +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
0b5af04a8b am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:09:55 +00:00
Svetoslav
ebb38bcc03 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:12 +00:00
Dianne Hackborn
b3af4ec6ba Fix issue #17948288: Improve accuracy of memory use reporting 
We now use Mapped to not double-count cached pages that are
mapped in to app processes.  Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space.  I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
 2014-10-17 15:25:13 -07: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
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
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