Commit Graph

67760 Commits

Author SHA1 Message Date
Gopal Krishna Shukla
260af96306 Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674 am: 810c31fdca
am: 621e87d72f

Change-Id: Ib5b7470db042d60593d2e545c901240a456dcada
2016-09-23 13:14:51 +00:00
Gopal Krishna Shukla
621e87d72f Merge "Provide synchronization to setview to avoid NPE" am: b05b93a674
am: 810c31fdca

Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
2016-09-23 13:11:23 +00:00
Gopal Krishna Shukla
810c31fdca Merge "Provide synchronization to setview to avoid NPE"
am: b05b93a674

Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
2016-09-23 13:07:52 +00:00
Michal Karpinski
6f81529e28 Fingerprint Strong auth timeout am: 0b72a722ed
am: 369672b8bb

Change-Id: Id152e63ba4b378ea10787198c3f6cd58d2f07495
2016-09-23 07:13:34 +00:00
Michal Karpinski
369672b8bb Fingerprint Strong auth timeout
am: 0b72a722ed

Change-Id: I70a4c0288aa2d98c02706a055a5dda710ace2ae2
2016-09-23 07:09:59 +00:00
Hugo Benichi
e69608f864 resolve merge conflicts of 00f07be to nyc-mr1-dev-plus-aosp
Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca
2016-09-23 14:48:01 +09:00
Hugo Benichi
00f07beff9 IpConnectivityLog uses new metrics service
am: 00a42d4c88

Change-Id: I1e3b611eeec448e333e83cb8d630f0e9906b7f14
2016-09-23 04:48:49 +00:00
Lorenzo Colitti
c411ec9e35 Restrict access to background networks to CHANGE_NETWORK_STATE. am: fbe9b1ad6f
am: 8bfa4053c2

Change-Id: Ie4179344aa12e38d2e2a5fab43e028ca0c97150d
2016-09-23 04:01:07 +00:00
Lorenzo Colitti
8bfa4053c2 Restrict access to background networks to CHANGE_NETWORK_STATE.
am: fbe9b1ad6f

Change-Id: Iaf4ccd24298f680cab39bf9b87604eb16bc53aa5
2016-09-23 03:57:32 +00:00
Hugo Benichi
0daeac5dd4 New IpConnectivityMetrics service am: eab511b582
am: 3a353a2044

Change-Id: I5cf485edd3ab1ebb81a2a9d35dfb8bd6d8bcc305
2016-09-23 03:54:06 +00:00
Hugo Benichi
3a353a2044 New IpConnectivityMetrics service
am: eab511b582

Change-Id: Iad65f10f079be13570e1f687dacb30f4f657a163
2016-09-23 03:49:04 +00:00
Lorenzo Colitti
fbe9b1ad6f Restrict access to background networks to CHANGE_NETWORK_STATE.
When a network goes into the background, tell netd to set the
network's permission to NETWORK. Also, close all TCP sockets on
that network, to prevent long-lived TCP connections from staying
on it and possibly continuing to use metered data.

Bug: 23113288
Change-Id: Ie89c1940b6739160e25c6e9022b8b977afb3e16e
2016-09-23 11:27:13 +09:00
Robert Carr
cfaae3f795 SurfaceView: Force surface disconnection before reuse. am: 387838be95
am: 288ce4fc42

Change-Id: Ied020f66caa429249b9f0d8baf0978f0ece9362e
2016-09-23 00:09:19 +00:00
Christopher Tate
150b5dbcc2 Fix crash in clearWallpaper() am: a2bd512034
am: 2a8f8f008c

Change-Id: Ia73abd24d04d68c4895da8861a42af8f5887ef4c
2016-09-23 00:01:30 +00:00
Christopher Tate
fd2173ed83 Add hidden intent extra about service availability am: 38c9c30640
am: 588729f07d

Change-Id: I9b3a2f4713a23954fa5a7b01e0d0d8297325180a
2016-09-22 23:56:05 +00:00
Robert Carr
288ce4fc42 SurfaceView: Force surface disconnection before reuse.
am: 387838be95

Change-Id: Ied6c33fac75612ed2cdeb45b24c521bbff979afa
2016-09-22 23:17:05 +00:00
Christopher Tate
2a8f8f008c Fix crash in clearWallpaper()
am: a2bd512034

Change-Id: I1ad7ef3676fab348022ee5b2a90ca144e44b06b8
2016-09-22 23:11:12 +00:00
Christopher Tate
588729f07d Add hidden intent extra about service availability
am: 38c9c30640

Change-Id: If626d4081621a5eee358bd7dfb86ae8349c67ef1
2016-09-22 23:08:21 +00:00
Adam Powell
22766c9a14 Null check for restoring LoaderManagers am: 100ba76d7a
am: bb2011a2e0

Change-Id: I8afc2a6f4808d1b36c1f2651617793854e799d11
2016-09-22 22:06:38 +00:00
Wale Ogunwale
0f82e46fb6 Save activity state before stopping acitivity when device sleeps am: b5066fe307
am: 3adb9d9318

Change-Id: Ic18fbf92fe029a0eea3d886450a97c9877db7020
2016-09-22 22:04:36 +00:00
Vladislav Kuzkokov
5d25d52900 Add DevicePolicyManager.setBackupServiceEnabled as hidden API. am: 5a122a1ce9
am: 8a48085267

Change-Id: I0dc9c4492dfac2a72fc976a1e5204c2c14ec14c4
2016-09-22 21:59:49 +00:00
Todd Kennedy
6f38e68456 Add remote control of Instant Apps am: d15bb75af6
am: f308ffc915

Change-Id: If7a6884bb896c1bab38c7d0fe963c06125a44c26
2016-09-22 21:55:44 +00:00
Adam Powell
bb2011a2e0 Null check for restoring LoaderManagers
am: 100ba76d7a

Change-Id: I7b5eecf24d73fd62abaa2825374bd936f15425e5
2016-09-22 20:38:00 +00:00
Wale Ogunwale
3adb9d9318 Save activity state before stopping acitivity when device sleeps
am: b5066fe307

Change-Id: I95e897de48a9f5b10728110b5b3c9d379f86f695
2016-09-22 20:36:32 +00:00
Christopher Tate
a2bd512034 Fix crash in clearWallpaper()
The underlying clearWallpaper() service method demands that only a
single kind of wallpaper be specified as the target; but a recent
patch attempted to expand the client-side legacy method to apply to
all kinds of wallpaper, incorrectly.  This patch corrects that client-
side code to do things properly.

Bug 30456015

Change-Id: I0a881957b881206e5eb775c6879ba90f10f9ffb0
2016-09-22 13:18:05 -07:00
Vladislav Kuzkokov
8a48085267 Add DevicePolicyManager.setBackupServiceEnabled as hidden API.
am: 5a122a1ce9

Change-Id: I134891f0b24cc666c34ae54cb3c937ba2f16648e
2016-09-22 20:03:40 +00:00
Todd Kennedy
f308ffc915 Add remote control of Instant Apps
am: d15bb75af6

Change-Id: I0433b101966f65daeb5d1d2ea04cf648572a8e58
2016-09-22 19:58:11 +00:00
TreeHugger Robot
6b87569b4c Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev 2016-09-22 19:29:25 +00:00
TreeHugger Robot
8da796d0b8 Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev 2016-09-22 19:27:27 +00:00
Adam Powell
100ba76d7a Null check for restoring LoaderManagers
Bug 31671195
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java

Change-Id: Ib553f7611814cc6759488aec505fd126ee664a9d
2016-09-22 10:53:45 -07:00
Vladislav Kuzkokov
dd6230d466 Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev 2016-09-22 17:09:06 +00:00
TreeHugger Robot
03779f227a Merge "Add remote control of Instant Apps" into nyc-mr1-dev 2016-09-22 16:57:17 +00:00
Wale Ogunwale
b5066fe307 Save activity state before stopping acitivity when device sleeps
Makes it consistent with the regular stop code path and allows
for the activity to be relaunched with the right state if a
relaunch happens after stop due to sleep.

Bug: 30241363
Change-Id: I92edfe6e0e3f5c7ce3b56d49df31e601a798cd4f
2016-09-22 07:32:40 -07:00
Hugo Benichi
00a42d4c88 IpConnectivityLog uses new metrics service
This patch connects existing IpConnectivityLog to the new
IpConnectivityMetrics service:
  - IpConnectivityLog is now an independent class that pushes events
    directly to the new IpConnectivityMetrics service.
  - DnsEventListenerService is moved from MetricsLoggerService to
    IpConnectivityMetrics.
  - this patch also features end to end tests from IpConnectivityLog to
    IpConnectivityMetrics dumpsys output.

Bug: 31254800
Change-Id: I4fe4a209eedde2814d5f13c574a1a0d854bd05c9
2016-09-22 23:08:37 +09:00
Hugo Benichi
eab511b582 New IpConnectivityMetrics service
This patch defines a new metrics service for IpConnectivity events
defined in android.net.metrics, separate from currently existing
MetricsLoggerService.

Similarly to MetricsLoggerService, the new service has an event buffer.
It also implements a dumpsys interface that can be used to flush events
and output a serialized proto.

Bug: 31254800
Change-Id: I0c3faeb4008b283f85d9ba9460371fa68956ea3b
2016-09-22 22:25:27 +09:00
Adam Powell
d10cf26137 Don't hold old host callback for fragments on the back stack am: 180202f221
am: 5254ef7bd3

Change-Id: I067c4fc441b34a7f9edfdbfee0995e91054fb890
2016-09-22 05:00:40 +00:00
Jeff Sharkey
15b0cc92cf Rename should behave like create: avoid conflict. am: 2c89a4c170
am: 0e033491ca

Change-Id: I071e31e47dd662d5a7816bc1c3326fe964a6daf8
2016-09-22 04:58:43 +00:00
Gopal Krishna Shukla
f7abcda5f2 Provide synchronization to setview to avoid NPE
If setView() will be called from two different threads
then mView property of a View object may have inconsistent
value. For instance, setView() may set mView to null causing
NullPointerException. Synchronize root.setView() as well to
avoid this.

Change-Id: I5f9cf47ece5d4aca575bd8644ecfcee0ed43d843
2016-09-22 04:48:24 +00:00
Adam Powell
5254ef7bd3 Don't hold old host callback for fragments on the back stack
am: 180202f221

Change-Id: I7f2c4c8d340b1b54d3e9ded5819e19fa3e4bc83e
2016-09-22 03:52:35 +00:00
Jeff Sharkey
0e033491ca Rename should behave like create: avoid conflict.
am: 2c89a4c170

Change-Id: I8d288a8afd06bc46d8d3051ce025c0af6c9875fa
2016-09-22 03:51:19 +00:00
Edward Savage-Jones
50fe2c4847 Fix WallpaperManager APIs
am: 6009d9db88

Change-Id: I82de1e6403306f0984d15db8448546aebf7ec107
2016-09-22 03:50:04 +00:00
TreeHugger Robot
33c9713bdd Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev 2016-09-22 00:50:00 +00:00
TreeHugger Robot
b90ae85acc Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev 2016-09-22 00:49:07 +00:00
Christopher Tate
38c9c30640 Add hidden intent extra about service availability
Backup has some subsidiary UI needs that are vendor specific,
and policy state is not readily observable from there.  We
therefore inform the sublaunched UI explicitly about the state
via an intent extra in the launch intent (rather than requiring
an API call from the launched UI).

Bug 30126678

Change-Id: I37f9530edbc00eea6c96f2c9fd67e878c07068c9
2016-09-21 17:18:10 -07:00
Jeff Sharkey
2c89a4c170 Rename should behave like create: avoid conflict.
When we create a file that already exists, we try attaching a suffix
like "(1)" to the filename to avoid the conflict.  The newly added
rename method should do the same, since developers may not have
access to delete the conflicting file.

Test: boots, rename via UI, new unit tests
Bug: 31545404
Change-Id: Ie397eebb0fbf98cf079eee3bbbb6c6b7ca627d91
2016-09-21 23:01:25 +00:00
Adam Powell
180202f221 Don't hold old host callback for fragments on the back stack
LoaderManagers configure their host callback lazily as their
associated fragment is brought up through its lifecycle states. In the
case of fragments on the fragment back stack this could happen very
late, if at all. As a LoaderManager's host callback references the
host Activity, this means that a LoaderManager could keep a destroyed
Activity reference alive.

Update the host callbacks of all LoaderManagers eagerly during the
restore non-configuration instance phase.

Bug: 30653222
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: I5d2b81daae5e7cae429fcf4934e64b3ce281140c
2016-09-21 15:47:06 -07:00
Edward Savage-Jones
6009d9db88 Fix WallpaperManager APIs
When support for lockscreen wallpapers was added in API level 24 the
behaviour for earlier API versions changed. Calls to the old 'set' APIs
no longer affect the overall device wallpaper, and can result in an end
user not being able to change their lockscreen wallpaper.

This upload restores the original API behaviour.

Bug: 31204228
Bug: 30456015
Change-Id: Ia16d2e2e379c54d798eef8f5c653099c2c581d78
2016-09-21 15:13:39 -07:00
Chris Tate
a03b5be55c Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f
am: 2cc80a362a

Change-Id: I57bc74595d92a6c1bfe0d2c9cc75e442723c4f4c
2016-09-21 20:47:24 +00:00
Chris Tate
2cc80a362a Merge "Fix WallpaperManager APIs" am: 73e89cd290
am: 6e1400f43f

Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
2016-09-21 20:39:56 +00:00
Chris Tate
6e1400f43f Merge "Fix WallpaperManager APIs"
am: 73e89cd290

Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
2016-09-21 20:34:49 +00:00