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

101832 Commits

Author SHA1 Message Date
Jiwen 'Steve' Cai
90d7153d0c Merge "ANativeWindow_toSurface implementation" into oc-dev am: 7e5d2c23a4 
am: 8671d4a328

Change-Id: If3751ba5c8cf6ba05f47e1b654559d9e4d8d54e9
 2017-04-04 04:51:43 +00:00
Jiwen 'Steve' Cai
8671d4a328 Merge "ANativeWindow_toSurface implementation" into oc-dev 
am: 7e5d2c23a4

Change-Id: I43258cd59a653fb6938a96d27579bf48d92a3195
 2017-04-04 04:41:42 +00:00
TreeHugger Robot
7e5d2c23a4 Merge "ANativeWindow_toSurface implementation" into oc-dev 2017-04-04 04:30:15 +00:00
Adam Lesinski
bcc5b9f569 Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845 
am: b188c93a45

Change-Id: Idb98d85c8f98588bce7ca6480b5ac4a673050940
 2017-04-04 03:41:14 +00:00
Adam Lesinski
b188c93a45 Merge "Themes: Apply themes to system_server safely" into oc-dev 
am: a52fc49845

Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335
 2017-04-04 03:33:42 +00:00
TreeHugger Robot
a52fc49845 Merge "Themes: Apply themes to system_server safely" into oc-dev 2017-04-04 03:25:29 +00:00
TreeHugger Robot
641691901e Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev 2017-04-04 02:59:36 +00:00
Android Build Merger (Role)
21b9e1255f Merge "Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev am: c56defe9c0 am: b0ed6b837e" 2017-04-04 02:14:18 +00:00
Jiwen 'Steve' Cai
d28e8283d3 ANativeWindow_toSurface implementation 
This enables the conversion from an ANativeWindow (created by NDK API
such as: AImageReader_create) to a Java Surface, so that developers can
hookup a Java Producer to a native buffer consumer.

This CL also introduces android_view_Surface_createFromSurface helper
function in libandroid_runtime to convert a C++ sp<Surface> to a Java
Surface object.

Bug: 36862948
Test: android.media.cts.NativeImageReaderTest
Change-Id: Ia99adb654da505ac117a8e58153ac800df23a650
 2017-04-03 19:13:31 -07:00
Zac Iqbal
127d4e7a6a Merge "Added a whitelist for factory trust agents." 2017-04-04 02:13:18 +00:00
Philip P. Moltmann
872c968c0d Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev am: c56defe9c0 
am: b0ed6b837e

Change-Id: I7cef506e23205de73d337b54979ed9f59d283495
 2017-04-04 02:13:00 +00:00
Philip P. Moltmann
b0ed6b837e Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 
am: c56defe9c0

Change-Id: I1f35ccc57b721fc72fdb22f0bd98c9436b1570e8
 2017-04-04 02:05:16 +00:00
Andrii Kulian
8623f89c32 Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f 
am: de938b99fc

Change-Id: I5420f04c0d3f910ad1db3e0e5266e26de0c6f3f7
 2017-04-04 02:00:22 +00:00
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
Andrii Kulian
de938b99fc Merge "Update display contents when metrics change" into oc-dev 
am: d6f0b0fc4f

Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f
 2017-04-04 01:49:35 +00:00
Daniel Cardenas
a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52 
am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
 2017-04-04 01:47:15 +00:00
Andrii Kulian
d6f0b0fc4f Merge "Update display contents when metrics change" into oc-dev 2017-04-04 01:38:25 +00:00
Daniel Cardenas
dbcf5279ad Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 
am: d017221a52

Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
 2017-04-04 01:38:16 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Hugo Benichi
d95470fa53 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev am: df9cf5450c 
am: 83f89047f5

Change-Id: I36ec48b9b8095cd407e5b56771227714cfec66db
 2017-04-04 01:05:54 +00:00
Hugo Benichi
83f89047f5 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 
am: df9cf5450c

Change-Id: I7d7b66cc1dc6888ea28e2b4d83d570fa440c29f2
 2017-04-04 00:58:02 +00:00
Hugo Benichi
df9cf5450c Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 2017-04-04 00:50:24 +00:00
Robert Sesek
eb6c098608 In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE. 
When creating an isolatedProcess=true service and when the native bridge
is in use, MountEmulatedStorage() is called with force_mount_namespace=true
and MOUNT_EXTERNAL_NONE. This led to an abort crash, since the process
would attempt to mount an empty path string.

Test: android.externalservice.cts.ExternalServiceTest built for ARM, run on Fugu
Bug: 36072260
Change-Id: I9441bcbd30167971ad486726bbeae57f3c4aebe9
Merged-In: I88474b6f50ae7cfab40ba44ff1da0df6021a2fb0
(cherry picked from commit 06f393067772f613e938f794444dc90e90c40fc0)
 2017-04-04 00:47:09 +00:00
Chad Brubaker
820ab35913 Merge "Expose animator settings to Instant Apps" into oc-dev am: d490fe0372 
am: fb095d897f

Change-Id: I9e28019f15b57a636df0d9881fb03e61813374c6
 2017-04-04 00:35:02 +00:00
Chad Brubaker
fb095d897f Merge "Expose animator settings to Instant Apps" into oc-dev 
am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
 2017-04-04 00:31:01 +00:00
TreeHugger Robot
d490fe0372 Merge "Expose animator settings to Instant Apps" into oc-dev 2017-04-04 00:23:34 +00:00
Chad Brubaker
3a93a90966 Merge "Expose framework activities to Instant Apps" into oc-dev am: b157f08bf8 
am: 59551672c1

Change-Id: I231f32fe6ec5958ed88490da42dbd69e57956bb5
 2017-04-04 00:05:08 +00:00
Chad Brubaker
59551672c1 Merge "Expose framework activities to Instant Apps" into oc-dev 
am: b157f08bf8

Change-Id: I250524c3ad576b8af2643b08b519d24832c73415
 2017-04-03 23:58:25 +00:00
Zachary Iqbal
666484d54d Added a whitelist for factory trust agents. 
Notes:
- If the config.xml value is set, only trust agents specified by the whitelist will be enabled by default.

Test: Manually set config.xml to whitelist agent.
Bug: 36819166
Change-Id: Ia17df30918792ccd7540f88be82268131a8e95f7
 2017-04-03 16:56:12 -07:00
TreeHugger Robot
b157f08bf8 Merge "Expose framework activities to Instant Apps" into oc-dev 2017-04-03 23:51:06 +00:00
Makoto Onuki
6483c2d5fa Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev am: 5fd39fad26 
am: d6da0d25cb

Change-Id: Iac4bdaf66a661218eca4a562646e4867998b5cab
 2017-04-03 23:47:26 +00:00
Makoto Onuki
d6da0d25cb Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev 
am: 5fd39fad26

Change-Id: I5b81cd880d505d8525a6210525c2b9c0c09b57a0
 2017-04-03 23:38:55 +00:00
TreeHugger Robot
5fd39fad26 Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev 2017-04-03 23:32:00 +00:00
Evan Rosky
1025620ed5 Merge "Handle edge-case where the focus-search root is focused" into oc-dev am: fe9ce65491 
am: 654281bcd1

Change-Id: Ib31d0bb871cebdf963b119ef90921922a5b51b08
 2017-04-03 23:24:33 +00:00
Evan Rosky
654281bcd1 Merge "Handle edge-case where the focus-search root is focused" into oc-dev 
am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
 2017-04-03 23:17:45 +00:00
Evan Rosky
fe9ce65491 Merge "Handle edge-case where the focus-search root is focused" into oc-dev 2017-04-03 23:10:56 +00:00
Daniel Cardenas
c40afac294 Increase visibility of FEATURE_LEANBACK_ONLY 
Bug: 36003137
Test: Build on Fugu and CTS
Change-Id: Iab9be686a004c5c0d1fae02a33898f7ebb264b27
 2017-04-03 16:06:40 -07:00
Dianne Hackborn
859a452353 Merge "Framework support to improve bg check CTS tests." into oc-dev am: 78e8ac9c14 
am: 13f9bb4c0a

Change-Id: I14c6dcd5f6328e700d1a6f5c059020767732bc6b
 2017-04-03 22:37:12 +00:00
Jeff Sharkey
010358f60d Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev am: a73aee4cdc 
am: 39561fa9a9

Change-Id: I6031f36aa31679a143b66e7f7eced1b468648de7
 2017-04-03 22:32:14 +00:00
Dianne Hackborn
13f9bb4c0a Merge "Framework support to improve bg check CTS tests." into oc-dev 
am: 78e8ac9c14

Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
 2017-04-03 22:32:11 +00:00
Yohei Yukawa
f3956983a6 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am: 1061992733 
am: 7f5b18356c

Change-Id: I44a3d6e304270fa1d53953aac0eaf8d42d748615
 2017-04-03 22:31:13 +00:00
Jeff Sharkey
39561fa9a9 Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev 
am: a73aee4cdc

Change-Id: I6b1bfbc5365906b0e8eb7a058fdda01297ef4c56
 2017-04-03 22:26:03 +00:00
TreeHugger Robot
78e8ac9c14 Merge "Framework support to improve bg check CTS tests." into oc-dev 2017-04-03 22:26:01 +00:00
Yohei Yukawa
7f5b18356c Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev 
am: 1061992733

Change-Id: Ief8593eb666c0162fa30753471112f2ab64f1e38
 2017-04-03 22:24:34 +00:00
Sanket Padawe
cfbec2293f Merge "Make some intents public in SubscriptionManager." into oc-dev am: 9077faab1f 
am: a374081697

Change-Id: I68cac494b2cae5217657098672a49ce99a6feca4
 2017-04-03 22:23:28 +00:00
TreeHugger Robot
a73aee4cdc Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev 2017-04-03 22:17:17 +00:00
Sanket Padawe
a374081697 Merge "Make some intents public in SubscriptionManager." into oc-dev 
am: 9077faab1f

Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
 2017-04-03 22:16:54 +00:00
Yohei Yukawa
1061992733 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev 2017-04-03 22:14:28 +00:00
Sanket Padawe
9077faab1f Merge "Make some intents public in SubscriptionManager." into oc-dev 2017-04-03 22:10:29 +00:00
Doris Liu
b1e357f247 Merge "Remove workaround for end() not supported in some app" into oc-dev am: 33f893202d 
am: f27cf9cb9a

Change-Id: Ib0af0d8db932c33842b3a71ec0040a1fe7d9061e
 2017-04-03 21:54:52 +00:00