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

313495 Commits

This Branch
This Branch
All Branches
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
Casey Burkhardt
c9dc8f8932 Merge "Fix AccessibilityManager returning duplicate services" into oc-dev am: 3bf7c7634a 
am: 1484735278

Change-Id: I9e8fc85fed53243691637735118877d53dae5a2a
 2017-04-04 04:49:14 +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
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
4264af08ad Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev am: d2778f32e2 
am: 2fa1415cff

Change-Id: I71a719904a899da0962cbfe4ba000a1688e8ac67
 2017-04-04 03:59:49 +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
Ian Pedowitz
4d91cb1bd3 Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev am: 61117c61d7 
am: 3f4d2f28f8

Change-Id: I16f52d3dc55861bdbc9813a5ea2bf91f24eabf87
 2017-04-04 03:53:51 +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
Android Build Merger (Role)
dfc07c0052 Merge "Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845 am: b188c93a45" 2017-04-04 03:41:56 +00:00
TreeHugger Robot
5dbb0f0047 Merge "Improve the error message when IntentSender started not for result" 2017-04-04 03:41:17 +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
Ajay Panicker
85bd208cfa Merge "Make sure that the device name is not null before returning it" into oc-dev am: 0f20dcdcb0 
am: bcbf10ffd3

Change-Id: I00bf39a6af5b3b06f7a6727ab0df581f5d1bed52
 2017-04-04 03:40:13 +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
22036364ec Merge "Clean up activity/stack associations." into oc-dev am: 9f467df804 
am: a36f50fa5d

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

Change-Id: I5e4d2ce521ebfdffe5be94674fde28d218f0ac05
 2017-04-04 03:20:11 +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
9eab2eaed8 Merge "Audio focus: API for external audio focus policy" into oc-dev am: 4d52ae9707 
am: 23e6cea555

Change-Id: Ica9bca5dde505616999eafded3f0861ce0fcffff
 2017-04-04 02:52:15 +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
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
Jeff Sharkey
a999b02c70 Merge "Emit fingerprints during OTA upgrades." into oc-dev am: 19627d678b 
am: 5ea809f29c

Change-Id: I4825d7480861ca6518f15bbfea0274c1527b2c3a
 2017-04-04 01:59:27 +00:00
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
TreeHugger Robot
d6c72ce92b Merge "Stop restoring tasks added before recent is loaded" 2017-04-04 01:56:50 +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
Ajay Panicker
4101bfe0ef Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e am: c6438a68d6 
am: 70b3e38772

Change-Id: I12902cef94e1311831a4c7ac5de76d75e411648b
 2017-04-04 01:51:01 +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
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
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