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

159764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +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
Jinsuk Kim
3379c1cb62 Fix broken build 
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
 2015-01-23 17:13:50 +09: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
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
Adam Lesinski
b443610bcb Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev 2015-01-23 02:29:50 +00:00
Adam Lesinski
ed643e8182 AAPT: Use the right enum when checking for density configurations 
Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
 2015-01-22 18:19:44 -08:00
Eino-Ville Talvala
7fde5e5ba3 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 2015-01-23 00:05:26 +00:00
Craig Mautner
dbabf37fd3 Merge "Even more debug for bug 17721767." into lmp-mr1-dev 2015-01-22 23:17:47 +00:00
Craig Mautner
de313753d0 Even more debug for bug 17721767. 
This time adding events for stack movement and focus change.

Change-Id: Icdff9763ac2daf85c615992fa2c8e418e907908c
 2015-01-22 14:28:03 -08:00
Ying Wang
24328660c8 Merge "Check in "current" system API files." into lmp-mr1-dev 2015-01-22 20:36:06 +00:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:27:57 +00:00
Ricardo Cervera
65ab86cf1a am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:02:30 +00:00
Ricardo Cervera
02d093ca67 am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 17:56:54 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Jason Monk
959ff1d3a9 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 2015-01-22 17:49:06 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines 
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
 2015-01-22 09:46:43 -08:00
Luan Nguyen
563e767a51 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:44:45 +00:00
Luan Nguyen
6117147791 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit 'edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:35:31 +00:00
Luan Nguyen
edb9ba54f7 am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:29:30 +00:00
Christoph Studer
c6a656c9ab SysUI: Don't drop HUN notification when clicked 
A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.

Bug: 19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224
 2015-01-22 16:26:43 +00:00
Benjamin Franz
fadb2b3a27 Avoid SecurityException when calling getUserData 
Currently we risk getting a SecurityException in a number of places,
where getUserData is called for a different user than the calling user.
To avoid this, the caller is cleared in a helper function.

Bug: 18662452
Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67
 2015-01-22 16:16:16 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041) 
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
 2015-01-22 08:15:57 -08:00
Jason Monk
6ece24e106 QS: Fix second line in dual tiles 
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.

Bug: 18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
 2015-01-22 10:40:54 -05:00
Jason Monk
1a5ac5b415 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 2015-01-22 14:11:53 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +00:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source 
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
 2015-01-22 16:58:26 +09:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jim Miller
ffd1a49c0b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 2015-01-22 02:37:39 +00:00
Jinsuk Kim
7de1ed9d63 Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 2015-01-22 02:19:37 +00:00
Wonsik Kim
0313a0e9b7 Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 2015-01-22 01:52:08 +00:00
Miao Wang
dbfcf3f812 Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 2015-01-22 01:16:30 +00:00
Eino-Ville Talvala
fa0b9a00b4 Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface) 
Add missing implementation.
Also improve docs for flexible Surface sources.

Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
 2015-01-21 16:49:59 -08:00
Craig Mautner
c79a8ea0c4 Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 2015-01-22 00:25:19 +00:00
Robert Greenwalt
ab42bbb902 Merge "Fix legacy request removal." into lmp-mr1-dev 2015-01-21 23:50:27 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda 
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:31:44 +00:00
Andrew Solovay
d4cf09d3a0 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:22:45 +00:00
Luan Nguyen
de9bd40e21 am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:21:24 +00:00
Andrew Solovay
e628954ea4 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:10:55 +00:00
Jinsuk Kim
8913a0e1e8 CEC: Let playback device switch TV input after bootup 
Saves users from having to switch TV input manually to a playback device
after it boots up.

Bug: 19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f
 2015-01-21 22:47:10 +00:00
louis_chang
b4d43538d7 Resume home activity can skip resume and cause ANR. DO NOT MERGE 
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
 2015-01-21 21:38:31 +00:00
Miao Wang
b590b354ef [Renderscript] Add check for Allocation.copyTo(Array) and 
Fix the input allocation type check for Histogram Intrinsic.

Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
 2015-01-21 21:17:19 +00:00
Jim Miller
b5db57a27d Clarify getTrustAgentConfiguration() documentation. 
Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
 2015-01-21 21:01:02 +00:00