311126 Commits

Author SHA1 Message Date
David Stevens
4693956388 Compute the focused window in display focus order
A WindowContainer's children are sorted so the focused child is at the
end of the list, so RootWindowContainer needs to iterate from end to
start when looking for the focused window.

Bug: 36590788
Test: DisplayContentTests#testFocusedWindowMultipleDisplays
Change-Id: I56e6b7d2054bc1e74b54a4f99706a08d278fa2e1
2017-03-27 11:07:22 -07:00
TreeHugger Robot
ecf0582e7d Merge "SurfaceView: Fix some log spam." 2017-03-21 06:29:18 +00:00
TreeHugger Robot
67bdd0f20e Merge "Fix NPE when mDecor is null on ActivityClientRecord" 2017-03-21 06:14:58 +00:00
Sudheer Shanka
4c66f8b20d Merge "Update NPMS to notify AMS when network policy rules are updated." 2017-03-21 06:13:03 +00:00
Guang Zhu
d5da694f83 Merge "Revert "AAPT: Version <adaptive-icon> to v26"" 2017-03-21 05:09:26 +00:00
Robert Carr
44ab575092 SurfaceView: Fix some log spam.
We were throwing relatively harmless NPEs here
and catching them below. The log message when
catching exceptions also needed some updating.
Not assosciated with a particular bug just
noticed in logcat.

Test: Manual
Change-Id: I5f07e6fc8ff3a34318682bf7b6c309fbba4097e4
2017-03-20 21:48:53 -07:00
TreeHugger Robot
1bff34337c Merge "Connectivity metrics: add transports to validation probes" 2017-03-21 04:22:40 +00:00
Adam Lesinski
1f4497c9c0 Merge changes I8c710af6,Iedf30212
* changes:
  libandroidfw: Fix mass logspam of ResourceTypes warnings
  NativeActivity JNI: Retain VM reference to AssetManager
2017-03-21 03:54:16 +00:00
Guang Zhu
8c2df71739 Revert "AAPT: Version <adaptive-icon> to v26"
Bug: 36462965
Bug: 35908647

This reverts commit c7614e5d1e8f9139cccf6ab9b78dda16b98f7656.

Change-Id: I25279e7c53823dad0703c7e2ea8ff91bdbc1a0f2
2017-03-21 03:53:43 +00:00
Keun-young Park
60ec4506f7 Merge "log last fs shutdown time / stat before reboot" 2017-03-21 03:50:46 +00:00
TreeHugger Robot
c7da040f22 Merge "Change string for connected via WFA." 2017-03-21 03:15:14 +00:00
TreeHugger Robot
afdd4cfc76 Merge changes I8bfabcb1,I563a6a31
* changes:
  Connectivity metrics: change how interface names are logged
  Connectivity metrics: serialize networkId, transports, ifname
2017-03-21 02:59:20 +00:00
Hugo Benichi
f927f0c52e Connectivity metrics: add transports to validation probes
This patch adds transports info to ValidationProbeEvent and migrates
netId logging for this event to the topt-level netId field in
ConnectivityMetricsEvent.

Test: modified unit tests. $ runtest frameworks-net passes
Bug: 3490169
Change-Id: Ibf51049ba8901ae5ca4ea86e2f500944a4738b5c
2017-03-21 11:43:18 +09:00
Stephen Chen
36dd5cf152 Change string for connected via WFA.
Bug: 34773168
Test: runtest
Change-Id: I292013c874012cca004be1078f854cb3ee145112
2017-03-20 18:22:58 -07:00
Hugo Benichi
948a85948d Connectivity metrics: change how interface names are logged
This patch deprecates the ifname field for specific metrics events of
types DhcpClientEvent, DhcpErrorEvent, IpReachabilityEvent and
IpManagerEvent.

Instead ifnames are logged in ConnectivityMetricsEvent, allowing for
link layer inference.

Test: updated unit tests, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I8bfabcb115bbd5289471d653c153a40bb48f28cd
2017-03-21 10:18:56 +09:00
Hugo Benichi
73fd4d1faf Connectivity metrics: serialize networkId, transports, ifname
This patch adds translation from ConnectivityMetricsEvent to
IpConnectivityEvent of recently added fields:
 - top-level network id
 - top-level ifname
 - transports

Also adds inference of link layer from transports or ifname.

At the moment these new fields are not populated in
ConnectivityMetricsEvent. Follow-up patches will fill this gap for
the events of the android.net.metrics package.

Test: new unit tests, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0
2017-03-21 10:18:11 +09:00
Adam Lesinski
60b4af5d65 Merge "AssetManager: Guard against null in array retrieval" 2017-03-21 01:03:18 +00:00
Pankaj Kanwar
b8ce44443c Merge "Updated javadocs for sendUssd APIs." 2017-03-21 00:45:55 +00:00
Keun-young Park
fbd19aad72 log last fs shutdown time / stat before reboot
- init will record shutdown time spent in file system part
  to kernel log, and it is avaiable as last_kmsg after reboot.
- Find it from last_kmsg and log it.

bug: 36004738
Test: reboot / cold boot and check logs
Change-Id: Ic5795b327eec482895ac79b39be2a246c6997999
2017-03-20 17:39:46 -07:00
Sudheer Shanka
e736185ee9 Update NPMS to notify AMS when network policy rules are updated.
Bug: 27803922
Test: runtest -c com.android.server.am.ActivityManagerInternalTest frameworks-services
      runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services

Change-Id: I357fd5c80b7e6d3e63df95397e328c52f233958b
2017-03-20 17:34:09 -07:00
Winson Chung
248278fc82 Merge "Update PiP AppOps flag to enforce all PiP functionality." 2017-03-21 00:29:05 +00:00
Winson Chung
056d2201d4 Merge "Showing notification when activity is in PiP." 2017-03-21 00:29:05 +00:00
Jin Qian
3b1ed1cb3d Merge "Revert "Add remote callbacks for persistent vr mode"" 2017-03-21 00:19:32 +00:00
Kevin Hufnagle
77103b14d8 Merge changes Ie70977f9,I45ef3001
* changes:
  2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
  docs: Edited ShortcutManager reference docs for Android O.
2017-03-21 00:16:04 +00:00
Adam Lesinski
03b0a277e8 Merge "AAPT: Version <adaptive-icon> to v26" 2017-03-21 00:15:31 +00:00
Jeremy Klein
5ad4a9a396 Merge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f am: 23d6ba12f1
am: 0b8756e735

Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08
2017-03-21 00:10:46 +00:00
Jin Qian
2abf1c60cc Revert "Add remote callbacks for persistent vr mode"
This reverts commit 504c6d67d0c2e4cda5201372551914f94acce710.

Change-Id: Ia0f8d508272211736d421cf097abaa0bcbc3abab
2017-03-21 00:04:53 +00:00
TreeHugger Robot
8ab4f6ea0e Merge "Fine-grained systrace for NetworkPolicyManagerService" 2017-03-21 00:04:29 +00:00
Jeremy Klein
0b8756e735 Merge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f
am: 23d6ba12f1

Change-Id: I35f45927c564773c10da78e1476814f0a1c7f1be
2017-03-21 00:04:11 +00:00
Jeremy Klein
23d6ba12f1 Merge "In isTetheringSupported, call isAdmin user from system."
am: 4a8953094f

Change-Id: Ibefe655ed377c55322d871e02d87c0d001327da8
2017-03-20 23:58:09 +00:00
Jeremy Klein
4a8953094f Merge "In isTetheringSupported, call isAdmin user from system." 2017-03-20 23:50:58 +00:00
Stephen Kiazyk
f903b739a0 Fix NPE when mDecor is null on ActivityClientRecord
It seems like this case is handled in all other instances that mDecor is
accessed, so I can only assume that this should also check for null.

Bug: 36396248
Test: Compile and run VR application, crash no longer observed.
Change-Id: I53559bd6f1b9e14f93b8f3881ba5b52b45289f65
2017-03-20 16:45:52 -07:00
Steven Thomas
de2ea83563 Merge "Add remote callbacks for persistent vr mode" 2017-03-20 23:43:53 +00:00
Eugene Susla
a540460e7b Merge "Register PackageMonitor for CompanionDeviceManagerService" 2017-03-20 23:04:16 +00:00
TreeHugger Robot
6e8e022d0d Merge "Ensure that we update the controller before setting menu visibility." 2017-03-20 22:56:23 +00:00
Jakub Pawlowski
2eb54b6bd8 Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am: f0c963a5b6 am: 375741e99a
am: d7714c45e0

Change-Id: I71d5455248a9840aadf02859ba8652bd80eca559
2017-03-20 22:41:06 +00:00
TreeHugger Robot
a0c5f7d869 Merge "More RecoverableSecurityException docs." 2017-03-20 22:37:25 +00:00
TreeHugger Robot
7bd4ea53e9 Merge "Allow setting a persistent VR thread." 2017-03-20 22:35:41 +00:00
Jakub Pawlowski
d7714c45e0 Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" am: f0c963a5b6
am: 375741e99a

Change-Id: Ieb03aed00cee20c367f52aa8ea1b1fd02a6fbbac
2017-03-20 22:33:09 +00:00
Jakub Pawlowski
375741e99a Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am: f0c963a5b6

Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
2017-03-20 22:26:42 +00:00
Jakub Pawlowski
f0c963a5b6 Merge "Bluetooth 5 AdvertisingSet implementation (1/4)" 2017-03-20 22:19:08 +00:00
Makoto Onuki
0e6e3bd1dc Fine-grained systrace for NetworkPolicyManagerService
Bug 34961340
Test: manual test with systrace.py

Change-Id: I6b0e53758d80db1ed9e522f82fff9ccc16301fb0
2017-03-20 15:18:22 -07:00
Sid Soundararajan
4b9f18f002 Merge "Add Long Press to Launch All Apps View" 2017-03-20 22:17:10 +00:00
Winson Chung
f4ac063f3e Update PiP AppOps flag to enforce all PiP functionality.
- Previously it only enforced whether an app could enter PiP as it was
  hiding.
- Also updating metrics constant name to reflect the change.
- Adding public OPSTR for apps to check if it the user has disabled PiP

Bug: 35957404
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I979b5c6d4c85946623999ced1cfb197d830ccecb
2017-03-20 15:15:52 -07:00
TreeHugger Robot
3f1fb26bbc Merge "Batch autofill() calls to views with virtual children." 2017-03-20 22:03:25 +00:00
Jeremy Klein
246a1feeb7 In isTetheringSupported, call isAdmin user from system.
This avoids requiring the MANAGE_USERS permission in this function.

Bug: 32671528
Test: Manual. Also seeking unit test guidance from reviewer.
Change-Id: I841e721013b0e4b6db34d629a1e97b3cd54cd73b
2017-03-20 15:02:30 -07:00
Kevin Hufnagle
652438cb19 2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
Test: make ds-docs -j12

Bug: 34685739
Change-Id: Ie70977f9b7b5b08de8bdd583a1e21b8a00eb5970
Original-Change-Id: I3cfa360ebd025a7eb198d7fe54f96059f42cd7f5
Original-Change-Id: I45ef30010f696604c06ce2cd7e2eca1db012e68b
2017-03-20 15:01:39 -07:00
Jerry Zhang
e30d5723e4 Merge "Add support for MTP perceived device type property." am: b6ed343e85 am: 7644b885c7
am: 136f37b88f

Change-Id: I446cd52e5fd8cda48e9af46ee3faee5578cae286
2017-03-20 21:54:28 +00:00
Adam Lesinski
ed69ce84bd libandroidfw: Fix mass logspam of ResourceTypes warnings
An overlay was incorrectly leaking its own resources into the
framework resource package, which caused warnings for every app
that tried to access framework resources (all of them).

This change skips including any resources that are not overlaying
anything (not present in IDMAP).

Bug: 36256974
Test: make libandroidfw_tests
Change-Id: I8c710af6849bb848938825aacca02799ee96c003
2017-03-20 14:51:13 -07:00
Bryce Lee
1514f9a69d Merge "Do not defer wm display logic when called from am." 2017-03-20 21:48:52 +00:00