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

4680 Commits

Author SHA1 Message Date
Griff Hazen
22cf018313 am 22b1113e: am 6e1eb1c9: am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-dev 
* commit '22b1113e0b4ecbf0b2660d642e6cd489c058d76d':
  Disable zen log printouts by default
 2014-10-20 21:55:04 +00:00
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
6cae74a800 am c8a01f35: am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit 'c8a01f353e957ee26d9f5624f32df6005ed03f21':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:25:20 +00: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
4e2c298876 am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 
* commit '2f6fd874510cd333f7fc0b08e146d5d069fa2013':
  Retire RecentApplicationsDialog
 2014-10-20 13:15:40 +00:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Yuncheol Heo
26ea56b3c5 am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed. 
* commit '5814bf1c7bc4b8abed781c1667305d843e7079fb':
  CEC: Add a callback for vendor when HDMI control setting is changed.
 2014-10-20 09:19:49 +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
dcc8004377 am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev 
automerge: f5e6935

* commit 'f5e693510153ecf855d7d2d807bd36b1bd9be28c':
  CEC: add getDeviceList()
 2014-10-20 03:28:32 +00: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
019de15ca2 am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
  Fix issue #17948288: Improve accuracy of memory use reporting
 2014-10-18 00:52:07 +00: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
Svetoslav
f43465452b am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:19:57 +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
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
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
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
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
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
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