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

159792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miao Wang
a0b297eda6 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:12 +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
Chet Haase
dbd670c508 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:03:24 +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
65d67b1ffd am e77adabe: Don\'t compute flags length for scan response 
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
 2015-01-23 17:55:53 +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
de2ca79507 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: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
ccba83dd83 am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
 2015-01-23 16:39:42 +00:00
Lorenzo Colitti
fb1c4f43a2 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 16:39:36 +00:00
Jinsuk Kim
bd10851d74 am 3379c1cb: Fix broken build 
* commit '3379c1cb62488393c2c49b5f38483656c7175fa1':
  Fix broken build
 2015-01-23 16:39:31 +00:00
Jinsuk Kim
ca9e4567fd 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 16:39:26 +00:00
Lorenzo Colitti
75854a80a7 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 16:39:16 +00:00
Adam Lesinski
80555f91f1 am b443610b: Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev 
* commit 'b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
  AAPT: Use the right enum when checking for density configurations
 2015-01-23 16:39:07 +00:00
Eino-Ville Talvala
c2a68d5e38 am 7fde5e5b: Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 
* commit '7fde5e5ba3d306bc694e2b97edf5892755fcb6d0':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
 2015-01-23 16:38:34 +00:00
Craig Mautner
3fbe92e1ab am dbabf37f: Merge "Even more debug for bug 17721767." into lmp-mr1-dev 
* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
 2015-01-23 16:38:20 +00:00
Ying Wang
c8423a5f23 am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
 2015-01-23 16:37:41 +00:00
Ricardo Cervera
28f5c401e1 am 4386d856: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c 
* commit '4386d856a8ced336d08dd82395b52f30d0c122ae':
  docs: Fixes to the watch faces design guidelines
 2015-01-23 16:36:43 +00:00
Jason Monk
0b703304d4 am 959ff1d3: Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 
* commit '959ff1d3a991b20140843187b2fb08c5a96c202b':
  QS: Fix second line in dual tiles
 2015-01-23 16:36:36 +00:00
Luan Nguyen
dbb81ed95a am 563e767a: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 
* commit '563e767a51357ed55c3fc53047fb9f94e4ef3c31':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-23 16:36:32 +00:00
Jason Monk
38539d179d am 1a5ac5b4: Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 
* commit '1a5ac5b415fea8098686aa08bffc6da3ada31938':
  Show connect dialog when selecting secure QS wifi
 2015-01-23 16:36:08 +00:00
Nicolas Prevot
aca061bddb am ad44f744: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 
* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-23 16:36:02 +00:00
Erik Kline
da01f0ff3d am 147cf4b8: Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 
* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
 2015-01-23 16:35:55 +00:00
Jim Miller
e2819727c0 am ffd1a49c: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 
* commit 'ffd1a49c0b8e442aea73c4f5336ea486492981f6':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-23 16:35:51 +00:00
Jinsuk Kim
2aec6d36d6 am 7de1ed9d: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 
* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
 2015-01-23 16:35:47 +00:00
Wonsik Kim
426b1bbc8c am 0313a0e9: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev 
* commit '0313a0e9b786f9d5d83113d574bcc8f27f2206dc':
  TIF: TvInputHardwareManager puts multiple sink ports into audio patch
 2015-01-23 16:35:44 +00:00
Miao Wang
05d0d2418c am dbfcf3f8: Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev 
* commit 'dbfcf3f812c78d1e76c317b8f200488dcaea4d77':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
 2015-01-23 16:35:39 +00:00
Craig Mautner
daf2ef637d am c79a8ea0: (-s ours) Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
  Resume home activity can skip resume and cause ANR. DO NOT MERGE
 2015-01-23 16:35:33 +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
Chet Haase
d15e94f030 Allow infinite-repeat zero-duration animators to continue repeating 
A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.

The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.

Issue #19113776 Fix infinite-repeating, zero-duration animator behavior

Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
 2015-01-23 02:07:00 +00: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