Dianne Hackborn
59c6507670
Merge "Allow appops command to modify uid ops." into oc-dev
...
am: 81bfe1f62e
Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad
2017-04-12 21:51:00 +00:00
Dianne Hackborn
81bfe1f62e
Merge "Allow appops command to modify uid ops." into oc-dev
2017-04-12 21:37:52 +00:00
Dianne Hackborn
ef95ec85ea
Merge "Add API to get a uid's current importance." into oc-dev
...
am: ad6ab44e15
Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
2017-04-12 21:27:27 +00:00
Dianne Hackborn
33e80232fc
Merge "Fix issue #37220301 : Allow broadcasts with permissions to not be restricted" into oc-dev
...
am: f74210c3a3
Change-Id: I1ed7f3e0cf3ee644bdbe5cb87b06f8b910d9ddec
2017-04-12 21:21:52 +00:00
Dianne Hackborn
ad6ab44e15
Merge "Add API to get a uid's current importance." into oc-dev
2017-04-12 21:11:46 +00:00
Dianne Hackborn
f74210c3a3
Merge "Fix issue #37220301 : Allow broadcasts with permissions to not be restricted" into oc-dev
2017-04-12 21:10:03 +00:00
Todd Kennedy
455b742bb6
Merge "Allow instant app resolution for any user" into oc-dev
...
am: e7b806e9d2
Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
2017-04-12 20:00:09 +00:00
Jesse Evans
3d1676cfc4
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
2017-04-12 19:52:07 +00:00
TreeHugger Robot
e7b806e9d2
Merge "Allow instant app resolution for any user" into oc-dev
2017-04-12 19:45:55 +00:00
Jaewan Kim
e391fe76e8
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
...
am: e7ce1d40e1
Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
2017-04-12 19:45:21 +00:00
TreeHugger Robot
684b5381e9
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
2017-04-12 19:39:16 +00:00
TreeHugger Robot
e7ce1d40e1
Merge "Add documentation for 'am start-foreground-service'" into oc-dev
2017-04-12 19:37:26 +00:00
Julia Reynolds
bf3f4dd7f5
Merge "Clear calling identity before verifying listeners" into oc-dev
...
am: 43dd3ba3c4
Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
2017-04-12 19:24:55 +00:00
Julia Reynolds
43dd3ba3c4
Merge "Clear calling identity before verifying listeners" into oc-dev
2017-04-12 19:13:05 +00:00
Charles He
fd7eb11a2b
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
...
am: 9f074e2224
Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
2017-04-12 18:36:10 +00:00
Charles He
9f074e2224
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
2017-04-12 18:25:49 +00:00
Dianne Hackborn
cba1893400
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
...
am: 0a0a63c8b1
Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
2017-04-12 18:02:53 +00:00
Powei Feng
c27853471e
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
...
am: f63cb49b15
Change-Id: If3d06de8fcc60080b51bb367ddc37b3d924af0b3
2017-04-12 18:01:12 +00:00
Dianne Hackborn
0a0a63c8b1
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
2017-04-12 17:55:56 +00:00
Dianne Hackborn
83249ec4f1
Add API to get a uid's current importance.
...
This is kind-of useful to go along with monitoring
uid importance changes.
Test: none yet
Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
2017-04-12 10:54:31 -07:00
TreeHugger Robot
f63cb49b15
Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev
2017-04-12 17:53:02 +00:00
Soonil Nagarkar
865cf6de70
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
...
am: 25a263a303
Change-Id: If35b625802224f7f1dbfb24d83e469093bdc718b
2017-04-12 17:36:30 +00:00
Soonil Nagarkar
25a263a303
Merge "Fix foreground importance bug in LocationManagerService." into oc-dev
2017-04-12 17:27:47 +00:00
Jorim Jaggi
7b2bcd0410
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
...
am: fe99773a70
Change-Id: I88f17c51cb020ed30b771a1bebfa565640f262fc
2017-04-12 17:18:06 +00:00
Jorim Jaggi
a218d21d2f
Merge "Fix NPE in TaskSnapshotController" into oc-dev
...
am: 6846676b9b
Change-Id: Id27ee1c5147bbceddf36c3159d6fbf654ab965f7
2017-04-12 17:16:44 +00:00
Jorim Jaggi
fe99773a70
Merge "Disallow task snapshot starting window for intent != ACTION_MAIN" into oc-dev
2017-04-12 17:06:15 +00:00
Jorim Jaggi
6846676b9b
Merge "Fix NPE in TaskSnapshotController" into oc-dev
2017-04-12 17:04:13 +00:00
Daniel Nishi
00ab1deef7
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
...
am: feada91060
Change-Id: I11d4cd7a4acb384c3a4d134d55d8630de24ce533
2017-04-12 16:43:42 +00:00
Daniel Nishi
feada91060
Merge "Use the StorageStatsManager in FileCollector." into oc-dev
2017-04-12 16:37:53 +00:00
Charles He
e7c5ced211
Disallow direct-boot aware activities to bypass work lock
...
Effectively reverting 89927b3cd96472c478a988d6c731cd09d412a043, which
allowed direct-boot aware activities in the work profile to show before
the profile was unlocked. This causes problems with key eviction
introduced in O. Specifically, many system activities (e.g.
ChooserActivity, activities in Settings, etc.) are marked direct-boot
aware, and therefore can be started while the work profile is locked
with key evicted. Currently they either bypass the keyguard when they
should not, or simply crash due to profile still being locked.
In the future, we need to create a new mechanism to allow activities
such as video calls, alarm clocks, etc. to bypass the work keyguard. It
probably involves checking for something like FLAG_SHOW_WHEN_LOCKED.
Bug: 36961785
Bug: 35708183
Bug: 30296144
Test: manual, by following the steps in the bugs quoted
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5ccaaf963f3dd96e4abb785a10aa258b15363178
2017-04-12 17:35:07 +01:00
Julia Reynolds
da78147f29
Clear calling identity before verifying listeners
...
Also don't throw when can't verify listener.
And update mocking in tests to clean state between tests.
Bug: 36783632
Fixes: 37263567
Test: runtest-systemui-notification, create a secondary user
Change-Id: I5ec95539c9859b67b8fbc7e6a85334e08e6b5a98
2017-04-12 12:08:56 -04:00
Jean-Michel Trivi
163cdf2fb5
Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
...
am: 170e3e242b
Change-Id: Ie4784a0933e5113b8069da09683a13f4166bc87e
2017-04-12 15:55:12 +00:00
Jean-Michel Trivi
170e3e242b
Merge "VolumeShaper: update API, use "Millis" instead of "Ms"" into oc-dev
2017-04-12 15:45:58 +00:00
Jesse Evans
fc1bfc442c
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
...
Renames the instant apps setting to reflect what it is for.
Adds the SystemApi annotation to make this field visible
to the resolver and installer.
Test: existing tests
Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
2017-04-12 07:00:51 -07:00
Hugo Benichi
3bc2ac3f82
Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7 am: 65fa0676bf
...
am: 4c63d86db7
Change-Id: Iffc7ff461b685f14ced20ac0cd186f31aa4061ad
2017-04-12 10:00:32 +00:00
Hugo Benichi
4c63d86db7
Merge "Captive portal: fix probe urls at network creation" am: 923ef69ae7
...
am: 65fa0676bf
Change-Id: I3f4e5e226d6a6371a6fed02d472d1cad4995c64a
2017-04-12 09:55:06 +00:00
Kevin Chyn
0a08ec9f29
Merge "Implement enumerate in FingerprintService" into oc-dev
...
am: c2f8949b32
Change-Id: Iae38c3a036374d5556f1020cd3fd472b5e7c819f
2017-04-12 09:45:43 +00:00
Treehugger Robot
923ef69ae7
Merge "Captive portal: fix probe urls at network creation"
2017-04-12 09:38:41 +00:00
TreeHugger Robot
c2f8949b32
Merge "Implement enumerate in FingerprintService" into oc-dev
2017-04-12 09:35:17 +00:00
Jean-Michel Trivi
0dfbd1569d
VolumeShaper: update API, use "Millis" instead of "Ms"
...
Test: make
Bug: 36785428
Change-Id: Ib77ff448bb8454453b1bd39f1491b0189b4ff15b
2017-04-11 19:05:26 -07:00
Andreas Gampe
fac61e4928
Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
2017-04-12 01:36:40 +00:00
Julia Reynolds
a38256bb7b
Merge "Allow companion device mgrs channel access" into oc-dev
...
am: de99065a40
Change-Id: I7de72421e62670f69d2d85837868efe0ef019a0a
2017-04-12 01:31:03 +00:00
TreeHugger Robot
de99065a40
Merge "Allow companion device mgrs channel access" into oc-dev
2017-04-12 01:22:52 +00:00
Conrad Chen
081db81a99
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
...
am: 307bec8572
Change-Id: I3550c39408739e0a3d1fce93cc35b09a3b77d70f
2017-04-12 01:17:00 +00:00
Dianne Hackborn
b8633f3a2e
Fix issue #37220301 : Allow broadcasts with permissions to not be restricted
...
Allowed!
Test: new CTS tests added.
Change-Id: I16f49746c0d6f5368625b54df6ffb510aa4cb5ab
2017-04-11 17:38:42 -07:00
Conrad Chen
307bec8572
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
2017-04-12 00:25:37 +00:00
Jorim Jaggi
bae01b1a70
Disallow task snapshot starting window for intent != ACTION_MAIN
...
We don't want to show a task snapshot if the intent wasn't the
launcher intent. Likely the app will show something different, so
we shouldn't show a snapshot in this case.
Test: AppWindowContainerControllerTests
Test: Open app, make sure we get snapshot window
Test: Open Chrome, go home, Open chrome incognito from shortcut,
make sure no flash
Change-Id: Ib608ba8070ce09f418f1036248d81eebfa354128
Fixes: 35099602
2017-04-11 17:24:26 -07:00
Jorim Jaggi
a18b3c475c
Merge "Improve caching behavior of thumbnails" into oc-dev
...
am: b67e105e74
Change-Id: I48914589de80ca11c97919bb5af6903ae46d2b3f
2017-04-12 00:01:41 +00:00
Wale Ogunwale
1ee52a4c36
Merge "Ensure visible activities when device is unlocked." into oc-dev
...
am: 293afb3917
Change-Id: I7e8827cdc75212223fa9e42852f8505dbebee8eb
2017-04-11 23:59:22 +00:00
Daniel Nishi
bd441caaf6
Use the StorageStatsManager in FileCollector.
...
This should vastly improve the speed of the FileCollector.
Change-Id: I7a878a0622bbd6c758fb1d36125414d8b025e709
Fixes: 35807386
Test: Existing tests continue to pass.
2017-04-11 16:53:23 -07:00
