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

173479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
5d4d8d68fc am b0b28059: Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev automerge: c309688 
* commit 'b0b28059b00fa17899e22b0a75310c9348186223':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:06:34 +00:00
Sanket Padawe
b0b28059b0 Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 
automerge: c309688

* commit 'c309688bfaf204c892635783aad96443a41fdffb':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:00:58 +00:00
Sanket Padawe
c309688bfa Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 2015-01-23 23:54:47 +00:00
Svetoslav
cd2ed4e64c Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:31:38 +00:00
Svetoslav
db1983b3f4 Accessibility: Sometimes cannot interact with nav bar items. 
automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:27:34 +00:00
Svetoslav
10a053e474 Accessibility: Sometimes cannot interact with nav bar items. 
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
 2015-01-23 15:05:20 -08:00
Svetoslav
9027d7355e am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
automerge: 6e9f276

* commit '6e9f276ff1554b59692a1820f60217307460308b':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1 am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4 Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 2015-01-23 22:22:18 +00:00
Jinsuk Kim
f612132003 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
automerge: ca1384d

* commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:20:46 +00:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
John Reck
1e5dd46133 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free
 2015-01-23 20:33:18 +00:00
John Reck
bb8d7ffeae am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
* commit '94474515e035d726ff24c48233c452ce34ef7c01':
  Prevent memory corruption from use-after-free
 2015-01-23 20:29:10 +00:00
John Reck
94474515e0 Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 2015-01-23 20:24:57 +00:00
Miao Wang
2fd1a8b6ca am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
automerge: 1446eb8

* commit '1446eb8f6130e4833ca2b74331b867d30445aca3':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:34:48 +00:00
Miao Wang
1446eb8f61 am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
* commit '2772ee6d8144bde55464592bb74ad35176425ea7':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:22:48 +00:00
Miao Wang
2772ee6d81 Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 2015-01-23 19:17:13 +00:00
Miao Wang
8a1265384b [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram 
Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
 2015-01-23 19:15:57 +00:00
John Reck
4018eb3763 Prevent memory corruption from use-after-free 
Bug: 19035637

If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this

Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
 2015-01-23 11:01:05 -08:00
Chet Haase
f647cde899 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
automerge: 458cc6a

* commit '458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:07:14 +00:00
Chet Haase
458cc6a515 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:04:03 +00:00
Prerepa Viswanadham
34c32f4034 am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
  Don't compute flags length for scan response
 2015-01-23 18:01:54 +00:00
Chet Haase
af8c621d21 Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963 am e77adabe: Don\'t compute flags length for scan response 
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
 2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf Don't compute flags length for scan response 
Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
 2015-01-23 17:51:43 +00:00
Christoph Studer
b97b519808 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
automerge: 9e9885e

* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 17:00:00 +00:00
Christoph Studer
9e9885e1c0 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
* commit '73500edb42d9270437e41ff2ddaa0cd6eacb422b':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 16:55:31 +00:00
Christoph Studer
73500edb42 Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev 2015-01-23 16:51:46 +00:00
Benjamin Franz
07b87e537d am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:42:38 +00:00
Benjamin Franz
bfca5f40eb am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +00:00
Lorenzo Colitti
5c9546b1da am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit '50f9d93a1c6f3d9f28966dd61997b4b780f31fb2':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 13:01:42 +00:00
Lorenzo Colitti
50f9d93a1c am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 
* commit 'ae38596bcf2a077753d170c0cad68f4dfde4277b':
  Support connecting to networks with misconfigured subnet masks.
 2015-01-23 12:56:58 +00:00
Lorenzo Colitti
ae38596bcf Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev 2015-01-23 12:50:32 +00:00
Lorenzo Colitti
2dfb79a54a Support connecting to networks with misconfigured subnet masks. 
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
 2015-01-23 21:10:34 +09:00
Narayan Kamath
c2d5128039 Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 
automerge: d555cd5

* commit 'd555cd550d634192e96e3b834f91aa9559a259db':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:54:44 +00:00
Narayan Kamath
d555cd550d Merge "Remove superfluous OpenSSL include paths." 
automerge: fe24754

* commit 'fe24754fd69e75829c748b56e5806f1603835db9':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:50:41 +00:00
Narayan Kamath
fe24754fd6 Merge "Remove superfluous OpenSSL include paths." 2015-01-23 10:47:34 +00:00
Jinsuk Kim
c4228a7281 CEC: Handles initiation of press-and-hold correctly 
Previously the time gap between the first and the second key event
for repeated keys(press-and-hold) can be bigger than the threshold,
which violates CEC spec. This CL rectifies it by managing its own
state rather than relying on Android key handler.

Bug: 19117830

Change-Id: Iedfa48f9ab826252e8616d1c3b7491e8b8333c81
 2015-01-23 18:20:20 +09:00
Jinsuk Kim
304f696b34 am 3379c1cb: Fix broken build 
automerge: 2652c57

* commit '2652c57257416f088de3e5b359f36a63e3cbe91d':
  Fix broken build
 2015-01-23 08:23:27 +00:00
Jinsuk Kim
2652c57257 am 3379c1cb: Fix broken build 
* commit '3379c1cb62488393c2c49b5f38483656c7175fa1':
  Fix broken build
 2015-01-23 08:19:56 +00:00
Jinsuk Kim
3379c1cb62 Fix broken build 
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
 2015-01-23 17:13:50 +09:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
 2015-01-23 07:00:40 +00:00
Jinsuk Kim
9ae7d4975c am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 
* commit '76cf035513d843c66d2fafe85b6a37c4c19b9223':
  CEC: Add logic to return to internal source
 2015-01-23 06:56:24 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Lorenzo Colitti
6840ffae67 am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
automerge: fbaf6b3

* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:06:57 +00:00
Lorenzo Colitti
fbaf6b353d am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 
* commit '78d51c2292b5a3b56be1b1e92bc67b70f4eebce4':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.
 2015-01-23 06:03:46 +00:00
Lorenzo Colitti
78d51c2292 Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev 2015-01-23 05:57:38 +00:00
Lorenzo Colitti
b205311456 Use the proper IpPrefix and LinkAddress constructors in VPN code. 
This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
 2015-01-23 14:30:22 +09:00