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

312947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Keun-young Park
e400768440 Merge "support shutdown animation from bootanim" into oc-dev 
am: 67b898a3db

Change-Id: I10eb52e2c6b68001c3a52bb33e170cf4c10f956e
 2017-04-03 23:59:29 +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
TreeHugger Robot
de5be11955 Merge "Adds appropriate filtering for instant apps" into oc-dev 2017-04-03 23:55:19 +00:00
TreeHugger Robot
67b898a3db Merge "support shutdown animation from bootanim" into oc-dev 2017-04-03 23:51:41 +00:00
TreeHugger Robot
b157f08bf8 Merge "Expose framework activities to Instant Apps" into oc-dev 2017-04-03 23:51:06 +00:00
Philip P. Moltmann
09b5ec8ee1 Merge "Not send switch intents if there is no real intent" into oc-dev 
am: 82331f7f73

Change-Id: Ief39b33a90bbc6d9428006baccd6b293572d17f3
 2017-04-03 23:51:02 +00:00
TreeHugger Robot
82331f7f73 Merge "Not send switch intents if there is no real intent" into oc-dev 2017-04-03 23:44:45 +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
Tony Mak
7c700a3d78 Merge "Whitelist DMAgent from bg check" into oc-dev 
am: fcfb396f5e

Change-Id: Ib9ea7bfae3cd7ba6d932bbe9cbd2a05d45516c45
 2017-04-03 23:37:56 +00:00
Bryce Lee
af691c0be7 Clean up activity/stack associations. 
The stack currently holds a reference to resuming and pausing
activities. These are usually cleaned up when the activity ends or
the task is reparented. However, it is possible for an activity to
lose its reference to its task in other areas (such as
ActivityStarter), which can lead to the stack not being updated
correctly.

This changelist adds a method to the ActivityStack to disassociate
the stack from an ActivityRecord. In addition to places where this is
called when an activity ends, this method is invoked on the children
of a task when the task is reparented. The task member variable of
ActivityRecord is also now surrounded by a setter/getter, with the
setter always invoking the dissociation logic on a previous stack.

Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests
Change-Id: Iffeccdb6f011958896271673946acfed28856f53
Fixes: 36387417
 2017-04-03 16:33:36 -07: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
TreeHugger Robot
fcfb396f5e Merge "Whitelist DMAgent from bg check" into oc-dev 2017-04-03 23:30:41 +00:00
Jeff Sharkey
0751546c16 Emit fingerprints during OTA upgrades. 
Can be used to help confirm diagnosis of bugs like 34525014.

Test: builds, boots
Bug: 36795529
Change-Id: Ie2517061ef031716c493b2544b0fb95628f20737
 2017-04-03 17:28:19 -06: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