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

312965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jiwen 'Steve' Cai
8671d4a328 Merge "ANativeWindow_toSurface implementation" into oc-dev 
am: 7e5d2c23a4

Change-Id: I43258cd59a653fb6938a96d27579bf48d92a3195
 2017-04-04 04:41:42 +00:00
Casey Burkhardt
1484735278 Merge "Fix AccessibilityManager returning duplicate services" into oc-dev 
am: 3bf7c7634a

Change-Id: If13ea24cf2d10a197d513029728f1135bb3be537
 2017-04-04 04:38:57 +00:00
TreeHugger Robot
7e5d2c23a4 Merge "ANativeWindow_toSurface implementation" into oc-dev 2017-04-04 04:30:15 +00:00
Casey Burkhardt
3bf7c7634a Merge "Fix AccessibilityManager returning duplicate services" into oc-dev 2017-04-04 04:29:27 +00:00
Jack He
2fa1415cff Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev 
am: d2778f32e2

Change-Id: Ia7b60079b09f6277d2b5c0959fe6fa9d1f2959e3
 2017-04-04 03:54:46 +00:00
TreeHugger Robot
d2778f32e2 Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev 2017-04-04 03:49:19 +00:00
Ian Pedowitz
3f4d2f28f8 Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev 
am: 61117c61d7

Change-Id: I77085a9cc1465d4c4295e5a6b666b677aec6ce25
 2017-04-04 03:45:50 +00:00
Ian Pedowitz
61117c61d7 Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev 2017-04-04 03:38:58 +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
Ajay Panicker
bcbf10ffd3 Merge "Make sure that the device name is not null before returning it" into oc-dev 
am: 0f20dcdcb0

Change-Id: I7d2a4101ebe29892e3dd365dc5531866bc8d3b2c
 2017-04-04 03:32:42 +00:00
Yohei Yukawa
55fed16929 Revert "Refresh opacity and statefulness on tint change" 
This reverts commit 1eda069f7c9a36e58c17ecf185a5c0906be5df95.

Reason to revert:
The setup wizard started throwing android.view.InflateException due to
I89f6d804fb025f426aefdee67559778cf03015bb. Temporarily reverting that
change until we figure out what is going on.

Change-Id: I9344a3402f2fab02f4fe49a6a8ad91970b2d3b3e
Test: Manually verified that the setup wizard no longer crashes.
Bug: 33124798
Bug: 36870685
 2017-04-04 03:30:01 +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
0f20dcdcb0 Merge "Make sure that the device name is not null before returning it" into oc-dev 2017-04-04 03:24:18 +00:00
Bryce Lee
a36f50fa5d Merge "Clean up activity/stack associations." into oc-dev 
am: 9f467df804

Change-Id: I1c7d75fec994d50cdb55fb798e4ed0c9beadab09
 2017-04-04 03:10:13 +00:00
Robert Sesek
bfdb730736 Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev 
am: 641691901e

Change-Id: I2e89af6876bfe0a9af9551453924580643bd13f8
 2017-04-04 03:09:15 +00:00
Bryce Lee
9f467df804 Merge "Clean up activity/stack associations." into oc-dev 2017-04-04 03:01:50 +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
Jean-Michel Trivi
23e6cea555 Merge "Audio focus: API for external audio focus policy" into oc-dev 
am: 4d52ae9707

Change-Id: I68deedce617588f0d7947183892727b5ed6c18b4
 2017-04-04 02:47:17 +00:00
TreeHugger Robot
4d52ae9707 Merge "Audio focus: API for external audio focus policy" into oc-dev 2017-04-04 02:40:02 +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
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
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
Jack He
42a25ba82e Bluetooth: Ensure only desired intents are being handled 
* Prevent arbitrary intents from making Bluetooth undiscoverable by only
  allowing DISCOVERABLE_TIMEOUT intent to be handled

Bug: 33058582
Test: make, test for Broadcast and Bluetooth scanning
Change-Id: Ib8b04dddf1610a082d167825253f3e1c968aaa14
 2017-04-04 01:51:04 +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
Jeff Sharkey
5ea809f29c Merge "Emit fingerprints during OTA upgrades." into oc-dev 
am: 19627d678b

Change-Id: I3a545f11f50716b23e3d110950afee179aecf7fa
 2017-04-04 01:48:26 +00:00
Ajay Panicker
70b3e38772 Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e 
am: c6438a68d6

Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
 2017-04-04 01:42:47 +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
Ajay Panicker
c6438a68d6 Merge "Make sure that the device name is not null before returning it" am: d4963e8035 
am: 87d114ac3e

Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7
 2017-04-04 01:35:05 +00:00
TreeHugger Robot
19627d678b Merge "Emit fingerprints during OTA upgrades." into oc-dev 2017-04-04 01:33:28 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Ajay Panicker
87d114ac3e Merge "Make sure that the device name is not null before returning it" 
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
 2017-04-04 01:27:41 +00:00
Dongwon Kang
2227541021 Merge "TIF: use integer for constants instead of string" into oc-dev 
am: b43a5305bd

Change-Id: I84143eee4102a8e40f74571b8c8903ff5a10cb56
 2017-04-04 01:19:09 +00:00
Ajay Panicker
7ecc417419 Make sure that the device name is not null before returning it 
Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
 2017-04-03 18:14:14 -07:00
Treehugger Robot
d4963e8035 Merge "Make sure that the device name is not null before returning it" 2017-04-04 01:11:08 +00:00
TreeHugger Robot
b43a5305bd Merge "TIF: use integer for constants instead of string" into oc-dev 2017-04-04 01:10:44 +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
Felipe Leme
ece77d4bdc Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev 
am: 5efad86b91

Change-Id: I090ee3668c21a49b570d323a0f765da10088c4c6
 2017-04-04 00:45:29 +00:00
Winson Chung
e2d8a79b2c Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev 
am: afb6b504b2

Change-Id: I0de879374d452f20a6b678aaf2f506034c21c749
 2017-04-04 00:44:32 +00:00
Jason Monk
6c04503fce Merge "Add some strings that will be needed for QS changes" into oc-dev 
am: f2764a4aed

Change-Id: Id89770140b8cac1ec746aff6a9c1fd4049449254
 2017-04-04 00:43:33 +00:00
Hangyu Kuang
958a284426 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev 
am: 99442d3427

Change-Id: I4fc864ea29049ea4585dd71ee8a921b35ae7e147
 2017-04-04 00:42:31 +00:00
TreeHugger Robot
5efad86b91 Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev 2017-04-04 00:39:56 +00:00
TreeHugger Robot
afb6b504b2 Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev 2017-04-04 00:39:09 +00:00
TreeHugger Robot
f2764a4aed Merge "Add some strings that will be needed for QS changes" into oc-dev 2017-04-04 00:35:41 +00:00
TreeHugger Robot
99442d3427 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev 2017-04-04 00:33:46 +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
Jesse Evans
daa4b22f45 Merge "Adds appropriate filtering for instant apps" into oc-dev 
am: de5be11955

Change-Id: I7c4ea3c1bfcefa59cf0abedc3c5c1d8ec8effa08
 2017-04-04 00:04:29 +00:00