50006 Commits

Author SHA1 Message Date
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
Casey Burkhardt
3bf7c7634a Merge "Fix AccessibilityManager returning duplicate services" into oc-dev 2017-04-04 04:29:27 +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
TreeHugger Robot
a52fc49845 Merge "Themes: Apply themes to system_server safely" into oc-dev 2017-04-04 03:25:29 +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
Bryce Lee
9f467df804 Merge "Clean up activity/stack associations." into oc-dev 2017-04-04 03:01:50 +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
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
Andrii Kulian
d6f0b0fc4f Merge "Update display contents when metrics change" into oc-dev 2017-04-04 01:38:25 +00:00
TreeHugger Robot
19627d678b Merge "Emit fingerprints during OTA upgrades." into oc-dev 2017-04-04 01:33:28 +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
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
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
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
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
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
Dianne Hackborn
13f9bb4c0a Merge "Framework support to improve bg check CTS tests." into oc-dev
am: 78e8ac9c14

Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
2017-04-03 22:32:11 +00:00
TreeHugger Robot
78e8ac9c14 Merge "Framework support to improve bg check CTS tests." into oc-dev 2017-04-03 22:26:01 +00:00
Makoto Onuki
eeb6197d39 Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
am: 6a7a967b71

Change-Id: I7b8cba52ec500fb789171d4dd97e467a8b926bfa
2017-04-03 22:23:35 +00:00
TreeHugger Robot
6a7a967b71 Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev 2017-04-03 22:13:34 +00:00
Winson Chung
19c85406cc Fixing issue with activity incorrectly auto-entering PiP.
- When the PiP menu activity was brought forward, we were inadvertently
  setting the auto-enter supported flag for the PiP base activity as
  well, which would trigger auto-enter PiP once the activity is moved
  back to fullscreen and then subsequently finished.

Bug: 36352343
Bug: 36364010
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Id1b800bf392d03b55562fb13374e33a5ff0ebda6
2017-04-03 15:07:59 -07:00
Felipe Leme
7c6e8e6c00 Fixed NPE when FillService replies with a null FillResponse.
This problem was not detected by CTS tests because the exception is
"harmless" (it's just ignored), but it can be verified at logcat:

W Binder  : Caught a RuntimeException from the binder stub implementation.
W Binder  : java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.IntentSender android.service.autofill.FillResponse.getAuthentication()' on a null object reference
W Binder  : 	at com.android.server.autofill.ViewState.maybeCallOnFillReady(ViewState.java:159)

Bug: 35707731
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: I58330a7e91b2c186bf97897b7d39640010ca630b
2017-04-03 15:03:17 -07:00
Jean-Michel Trivi
126cf03f7c Audio focus: API for external audio focus policy
System API for an external audio focus policy. Extends
 the system focus listener with interception of
 focus requests and abandons. Adds method for the focus
 policy to dispatch focus grants and losses.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testFocusPolicy'
Bug: 30258418
Change-Id: If408569a2dce07a774e0e2f1be9f1af8e426d2d3
2017-04-03 14:44:47 -07:00
Makoto Onuki
3cc7cd1c18 Don't wtf() for reverse profile access; make it a warning.
Bug:36003688
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I6d6a73e1d9281dc0b92186dd0666865b0f6b3f1c
2017-04-03 14:04:11 -07:00
Makoto Onuki
24e1ad4001 Merge "Persistent connection to DO/PO service." into oc-dev
am: dcc792a13f

Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245
2017-04-03 20:44:25 +00:00
TreeHugger Robot
dcc792a13f Merge "Persistent connection to DO/PO service." into oc-dev 2017-04-03 20:35:18 +00:00
Makoto Onuki
c4361e34ad Remove/fix broken test due to change to DUMP permission check.
Bug 36854321
Test: adb shell am instrument -e class 'com.android.server.pm.ShortcutManagerTest2' -w com.android.frameworks.servicestests

Change-Id: I80f2a326b70f8d0598246732510e3725a0c58871
2017-04-03 13:00:39 -07:00
Makoto Onuki
be3ee7ee30 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
am: ef7dff2563

Change-Id: I43302d90f7aa2c174c5e31cd5390e03c3c087157
2017-04-03 19:54:24 +00:00
Makoto Onuki
ef7dff2563 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev 2017-04-03 19:45:18 +00:00
Andrii Kulian
cd09799339 Update display contents when metrics change
There are two separate overrides for display metrics in DisplayManager
and WindowManager:
- In DM - LogicalDisplay#mOverrideDisplayInfo, in most cases not null.
- In WM - DisplayContent#mBaseDisplayWidth/Height/Density, different
from #mInitialDisplayWidth/Height/Density values when some metrics are
forced.

When display was resized its windows weren't updated because of
two problems: old LogicaDisplay#mOverrideDisplayInfo was preventing
WM from detecting the change and override (base) display metrics were
never updated by resize.

When display size changes:
- Before this CL:
DM receives DISPLAY_CHANGED event, it updates internal values and
WM is notified about them with a message. In most cases there is an
override obtained from WM and WM doesn't get new values from
LogicalDisplay#getDisplayInfoLocked().

- With this CL:
WM will requests real updated values from DM without any overrides
and will decide whether to apply them or not: if there is no override
in WM - it will apply values from WM, otherwise it will keep the
override. Also it will always update initial display metrics if there
is a real change detected.

Bug: 35258051
Bug: 34164473
Bug: 36518752
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testDisplayResize
Test: #testForceDisplayMetrics
Change-Id: I2495c27797f11f9aaee4ea06648a8ccd29ac5b62
2017-04-03 19:45:14 +00:00
Jason Monk
b3963766c6 Merge "Add test API for if the device supports QS" into oc-dev
am: be436bdefe

Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2
2017-04-03 19:22:35 +00:00
Jason Monk
be436bdefe Merge "Add test API for if the device supports QS" into oc-dev 2017-04-03 19:11:44 +00:00
Winson Chung
0ed0b685b4 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
2017-04-03 18:36:26 +00:00
Winson Chung
3152f5b4e6 Merge "Fixing regression in PiP TV." into oc-dev
am: 244e4854c3

Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec
2017-04-03 18:33:50 +00:00
Winson Chung
34ecbaa991 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 2017-04-03 18:23:31 +00:00
Winson Chung
244e4854c3 Merge "Fixing regression in PiP TV." into oc-dev 2017-04-03 18:22:41 +00:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
Andrii Kulian
45d534bf93 Merge "Fix some WM unit tests" into oc-dev
am: 2c93764bee

Change-Id: I7d2d610f3939eac1b271e45ae35457b7b71dc46a
2017-04-03 18:07:30 +00:00
Geoffrey Pitsch
635e4efa1c Merge "Fix deleting Misc channel for o-aps" into oc-dev
am: a906fb7b43

Change-Id: I5276632980c373a0bc1861915a10cecf29b6cce1
2017-04-03 18:05:06 +00:00
Todd Kennedy
58672aba18 Merge "Expose instant app to exposed providers" into oc-dev
am: 644648ebfd

Change-Id: I32fc7de9cd1a0823dd38e5103d85c47776bb1404
2017-04-03 18:03:47 +00:00
Todd Kennedy
48a2f0036c Merge "Implement service filtering" into oc-dev
am: 35110948b7

Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848
2017-04-03 17:46:59 +00:00
Bryce Lee
59d1f8a024 Merge "Add app bounds to configuration." into oc-dev
am: 7efe56b779

Change-Id: If871d90a72f675a93503e883135ebee77f12d971
2017-04-03 17:41:40 +00:00