50681 Commits

Author SHA1 Message Date
Adam Lesinski
51d94c82af Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am: af85d84050

Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
2017-04-13 20:22:19 +00:00
Dianne Hackborn
76c71a01e2 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
am: 29c70437b3

Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
2017-04-13 20:15:05 +00:00
Bryce Lee
61bce9ab13 Merge "Remove window container from empty task when destroying." into oc-dev 2017-04-13 20:10:56 +00:00
Daniel Nishi
3cf3b199e3 Revert "Use the StorageStatsManager in FileCollector."
This reverts commit bd441caaf6fb268b2756bc51304efa038bf58376 due to
causing NPE crashes.

Bug: 37314851
Change-Id: I933eaa3888f84945873de8f7fca0d235306f6aaa
2017-04-13 20:10:39 +00:00
Geoffrey Pitsch
aa8dcf3751 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
am: c4ca1b5677

Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
2017-04-13 20:10:13 +00:00
Adam Lesinski
af85d84050 Merge "BatteryStats: Remove reading of cpu power" into oc-dev 2017-04-13 20:09:51 +00:00
TreeHugger Robot
29c70437b3 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev 2017-04-13 20:01:32 +00:00
Todd Kennedy
0bb486bcb4 Merge "Filter instant app content providers" into oc-dev
am: 3891674204

Change-Id: I4e33d8e82a249249dfe25964cbfdb89b2f1e0318
2017-04-13 19:59:28 +00:00
TreeHugger Robot
c4ca1b5677 Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev 2017-04-13 19:50:00 +00:00
Chris Tate
636915a2ed Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
am: 117ac766a9

Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
2017-04-13 19:45:30 +00:00
TreeHugger Robot
3891674204 Merge "Filter instant app content providers" into oc-dev 2017-04-13 19:43:31 +00:00
Chris Tate
117ac766a9 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev 2017-04-13 19:24:13 +00:00
Jean-Michel Trivi
a53b7051a2 Fix A11y volume persisting/restore
When the accessibility volume is enabled, its value wasn't persisted
  when changed because it was still using the persisting name from
  its alias (music).
When enabled, notiify the volume controller that a11y volume has
  changed so the UI also reflects the new value, now updated from
  the persisted settings.
Do not persist volumes for streams that don't have a setting name.

Test: enable Talkback, set a11y volume at a different level than media \
  then disable Talkback. Reboot and enable Talkback, verify a11y is \
  restored.
Bug: 36286073

Change-Id: Ic6c30364e164b856fc10fbf6b22c09a7b5561be1
2017-04-13 12:04:15 -07:00
Dianne Hackborn
f66adfd1cd Add new facility to find out when a PendingIntent is canceled.
This is just an internal API in the platform, not (yet?) available
in the SDK.  But it will be useful for system services that want to
clean up state if a pending intent that has been registered with them
is canceled (either explicitly by the app, through the app being
uninstalled, etc).

Also improve the activity manager's dump of pending intents to
organize them by package, making it much easier to read (now that
we have so many active pending intents these days).

Test: ran and booted.  no CTS, since no API.

Change-Id: Iad029cfedcd77e87357eca7da1b6ae94451dd981
2017-04-13 11:04:30 -07:00
Geoffrey Pitsch
87237d70a5 Ensure removeForegroundService checks both lists under lock
Prior CL didn't lock properly and would still fail if a
notification was both enqueued and posted at the same time.

Test: runtest systemui-notification
Change-Id: I1bdd779ecb872f1a02ffc38b6007239eb522b521
Fixes: 36550043
2017-04-13 13:44:09 -04:00
Jeremy Joslin
3a74fcedad Merge "Always call unbind." into oc-dev
am: f726b4aa9a

Change-Id: If6fafdd633bb3c9120f00818de5f97ae2cfd7735
2017-04-13 17:41:06 +00:00
Sudheer Shanka
9865369cf5 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev
am: c59a2a7649

Change-Id: I5676e0f3927f2de123e9d5d219bd10a881754583
2017-04-13 17:38:59 +00:00
TreeHugger Robot
f726b4aa9a Merge "Always call unbind." into oc-dev 2017-04-13 17:28:52 +00:00
Julia Reynolds
41de81ea75 Merge "Allow notification channels to be silent." into oc-dev
am: d178ec489f

Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806
2017-04-13 17:23:39 +00:00
Hyunyoung Song
e99cf60039 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev
am: 76c13a5fce

Change-Id: I060797416983056208f21c099ba21fdc8409103a
2017-04-13 17:20:50 +00:00
Bryce Lee
840c566d13 Remove window container from empty task when destroying.
Previously, the window container was being removed whenever we were
removing the task in a destroy mode. However, this caused issues
where an activity may still be present in the task record, leading to
a subequent change to limit this to tasks with overlays. This led to
the situation where the window container would not be destroyed when
it was supposed to, such as moving an activity to recents, but
otherwise destroying.

This changelist addresses the issue by always removing the window
container from tasks when removed from their parent stack in a
destroy mode and empty. In the recents flow, this will fire and
cleanup when the activity is destroyed.

Change-Id: I87548d6ff8e4d77b6294504d7cc78370cd5d31fa
Fixes: 37301159
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests
2017-04-13 10:16:59 -07:00
Sudheer Shanka
c59a2a7649 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev 2017-04-13 17:10:00 +00:00
Julia Reynolds
d178ec489f Merge "Allow notification channels to be silent." into oc-dev 2017-04-13 17:07:46 +00:00
Julia Reynolds
a98a3444fb Merge "Companion device mgr doesn't always exist" into oc-dev
am: 3d6225b4e2

Change-Id: I10420e5cf8fdb6359c8191d0626cd71ecab395aa
2017-04-13 17:01:26 +00:00
Hyunyoung Song
76c13a5fce Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev 2017-04-13 16:53:43 +00:00
TreeHugger Robot
3d6225b4e2 Merge "Companion device mgr doesn't always exist" into oc-dev 2017-04-13 16:50:50 +00:00
Winson Chung
8561894fa9 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev
am: 68cf1b8848

Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d
2017-04-13 16:13:30 +00:00
Winson Chung
68cf1b8848 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev 2017-04-13 16:01:51 +00:00
TreeHugger Robot
7270534ac4 Merge changes I33ac2b52,I5ab8bb11 into oc-dev
* changes:
  Captive portal: fix probe urls at network creation
  NetworkMonitor: improve captive portal validation logs
2017-04-13 15:26:05 +00:00
Julia Reynolds
1a6ac41f72 Only foreground notis should be sorted higher
am: 889280c4c3

Change-Id: I755fc0766540a8e836fcd98901c87e4d1ee335c1
2017-04-13 15:19:09 +00:00
Julia Reynolds
727a728836 Companion device mgr doesn't always exist
E.g. on tvs.

Test: runtest systemui-notification
Change-Id: I1f1fd3cc5d361d3854eef5e5726816b50f5d7eb6
Fixes: 37276184
2017-04-13 15:05:45 +00:00
Julia Reynolds
184b86da38 Allow notification channels to be silent.
This better accomodates those apps that play their own sounds.
Since most apps don't play their own sounds, update the documentation
on notificationchannel to add guidance about when they should add a
sound.

Fixes: 37237013
Test: runtest systemui-notification
Change-Id: If00b15b1b44da66d24dacb2895e9a6c0a06d1890
2017-04-13 11:03:57 -04:00
Julia Reynolds
889280c4c3 Only foreground notis should be sorted higher
Having the ongoing flag is not enough.

Test: runtest systemui-notification
Change-Id: I8a6c15af819f2bb4ad3937ae45d33361663fbe13
2017-04-13 11:03:57 -04:00
Dianne Hackborn
80cc3154ee Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev
am: 809f4cf121

Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
2017-04-13 14:42:33 +00:00
TreeHugger Robot
809f4cf121 Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev 2017-04-13 14:32:41 +00:00
Hugo Benichi
e90070d528 Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106 am: 4d47eba86a
am: 4d47a6a26b

Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
2017-04-13 13:52:21 +00:00
Hugo Benichi
4d47a6a26b Merge "Revert "Captive portal: rotate fallback urls"" am: 9ea45b6106
am: 4d47eba86a

Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
2017-04-13 13:46:32 +00:00
Hugo Benichi
9ea45b6106 Merge "Revert "Captive portal: rotate fallback urls"" 2017-04-13 13:25:42 +00:00
Hugo Benichi
2e43e45e1e Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However  String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.

Will revert and resubmit with a comma.

This reverts commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.

Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
2017-04-13 12:43:49 +00:00
Hugo Benichi
54e288cc6d Merge changes Ia15f77e2,Icaa1f95c am: c923752929 am: 8e5ebd9261
am: b98eee1f78

Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
2017-04-13 10:10:27 +00:00
Hugo Benichi
b98eee1f78 Merge changes Ia15f77e2,Icaa1f95c am: c923752929
am: 8e5ebd9261

Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
2017-04-13 09:40:19 +00:00
Treehugger Robot
c923752929 Merge changes Ia15f77e2,Icaa1f95c
* changes:
  Captive portal: regroup hardcoded http response codes.
  Captive portal: rotate fallback urls
2017-04-13 09:24:33 +00:00
Erik Kline
4dd58ed08a Ignore potential SystemProperties errors when setting net.dns
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
(cherry picked from commit 4edba01eb4c05c0a9872014255e9e46c60463fd9)
2017-04-13 18:04:24 +09:00
Lorenzo Colitti
8b3da2ff4a Make ConnectivityServiceTest pass on wifi-only devices.
Test: ConnectivityServiceTest passes on ryu on internal master
Test: ConnectivityServiceTest passes on bullhead
Bug: 36249702
Change-Id: If94102c7df0257ea9e69e72b07a685ae3c2c4022
(cherry picked from commit 42cdf577037770a66d27f831d0f9e26532c3628d)
2017-04-13 18:03:58 +09:00
Erik Kline
152c9cf703 Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52 am: 85f5725fb5
am: 270ab2fa7e

Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
2017-04-13 08:44:51 +00:00
Erik Kline
270ab2fa7e Merge "Extract SimChangeListener to its own file" am: 0ef8df6d52
am: 85f5725fb5

Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
2017-04-13 08:38:44 +00:00
Treehugger Robot
0ef8df6d52 Merge "Extract SimChangeListener to its own file" 2017-04-13 08:19:07 +00:00
Hugo Benichi
a415870221 Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.

This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.

Test: built, flashed, tested manually with various portal networks
Bug: 36532213

Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
2017-04-13 16:45:47 +09:00
Hugo Benichi
0908daaaf0 Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
2017-04-13 16:45:44 +09:00
Robert Carr
b3871981f2 Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
am: 9d5ac93cc3

Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
2017-04-13 07:22:01 +00:00