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

313474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
5dbb0f0047 Merge "Improve the error message when IntentSender started not for result" 2017-04-04 03:41:17 +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
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
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
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
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
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
10b9632eac Merge "TIF: use integer for constants instead of string" into oc-dev am: b43a5305bd 
am: 2227541021

Change-Id: Ib3661309d1969e5b6407c739e4112d9c2a83e00d
 2017-04-04 01:26:33 +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
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
Felipe Leme
656fb1b4ca Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev am: 5efad86b91 
am: ece77d4bdc

Change-Id: Ibee9f3f4068b282e0d0f977abd3fafa2123b17de
 2017-04-04 00:52:55 +00:00
Winson Chung
51814c7ed6 Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev am: afb6b504b2 
am: e2d8a79b2c

Change-Id: I938ffe52529830e5a109bc08298a4ffd3301982f
 2017-04-04 00:51:56 +00:00
Jason Monk
58691f1212 Merge "Add some strings that will be needed for QS changes" into oc-dev am: f2764a4aed 
am: 6c04503fce

Change-Id: If354ea18a2919a1f9776942e9f4be09421d62d71
 2017-04-04 00:51:01 +00:00
Hugo Benichi
df9cf5450c Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 2017-04-04 00:50:24 +00:00
Hangyu Kuang
60024fca06 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev am: 99442d3427 
am: 958a284426

Change-Id: I0df6e5b0ba764b5b1f80e3e96b9ab7ecaf756a61
 2017-04-04 00:50:07 +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