Commit Graph

253881 Commits

Author SHA1 Message Date
smain@google.com
2f2365de4a add source.properties file to the offline docs build
which is required to get this in the SDK Manager

Change-Id: If53cdedcb8f5910fe37add44168348c9fd14d0cb
2016-09-21 16:26:41 -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
Stuart Scott
cffe1f48d3 Merge "Continue if package is not in system" into nyc-dr1-dev 2016-09-21 22:58:55 +00:00
Jaewan Kim
60d2af330b Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am: 8ba2549592

Change-Id: I5593d4149bbd8235d42a0cb2b23c9fb091aa70f9
2016-09-21 22:54:04 +00:00
Jaewan Kim
78fa55e261 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am: 22c9458a13

Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
2016-09-21 22:54:02 +00:00
Jaewan Kim
01796f794d DO NOT MERGE Check caller for sending media key to global priority session
am: 09c3df004b

Change-Id: Ib883850c8554fae35e29313e2ea6a19e3592148c
2016-09-21 22:53:59 +00:00
Jaewan Kim
868d586c98 DO NOT MERGE Check caller for sending media key to global priority session
am: c282c4f106

Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
2016-09-21 22:53:58 +00:00
Jaewan Kim
5abd69e59a Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
am: 64b7b1522e  -s ours

Change-Id: I1aaad42b1a3a82753aca4d55d743116cc3b674bd
2016-09-21 22:53:42 +00:00
Jaewan Kim
031fb04776 DO NOT MERGE Check caller for sending media key to global priority session
am: 4e9af38ec4  -s ours

Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
2016-09-21 22:53:38 +00:00
Jaewan Kim
e47b5adce2 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
am: 162c80bf0c

Change-Id: Icbabe6e78468cb4138b8cab77ff06432628739c0
2016-09-21 22:53:29 +00:00
Jaewan Kim
709d112eca DO NOT MERGE Check caller for sending media key to global priority session
am: 6a1567c267

Change-Id: Ic2bdd07b94fd9d6bdaa701d3e719904a2f84cc4d
2016-09-21 22:53:17 +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
Adarsh Fernando
9af57aa309 Found a couple of more references to Android N.
Bug:31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
2016-09-21 15:45:04 -07:00
Ben Lin
ba0ee69a15 Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev 2016-09-21 22:34:54 +00:00
Kevin Hufnagle
b6b57d432d docs: Fixed typo in "Query the View Hierarchy" heading title
Bug: 30878639
Change-Id: I7bd7a3a14d388f01df18da674bdb79adadf6da7f
2016-09-21 15:31:21 -07:00
Adarsh Fernando
fe060d3f37 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev 2016-09-21 22:26:51 +00:00
Jaewan Kim
64b7b1522e Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev 2016-09-21 22:21:06 +00:00
Kevin Hufnagle
d24bb252cb docs: Fixed layout of "Build Buzz" page.
Bug: 31652355
Change-Id: I9bd8608a6f4cc94665e4c2689902c7818015fbed
2016-09-21 15:15:14 -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
Adarsh Fernando
4b6d939321 Docs: Cleanup of Preview language in Android 7.0 docs.
bug:31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
2016-09-21 21:58:46 +00:00
Ajay Panicker
94c08c2bed Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893
am: a5e128ba97

Change-Id: Ibfdcd322fef7b589e6e6c14f25fb92b8b7ed43a1
2016-09-21 21:58:43 +00:00
Ajay Panicker
9c7ac98157 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6
am: 2cf025f976

Change-Id: Id5edc69b9594289566590d869ad0b4c0219fb242
2016-09-21 21:57:48 +00:00
Ajay Panicker
852e5a43b9 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d
am: 4431d6cb5b

Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d
2016-09-21 21:56:51 +00:00
Ajay Panicker
dc0f9fa9c9 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4
am: 35d1b45b0f

Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a
2016-09-21 21:56:49 +00:00
Ajay Panicker
8be4dc7e16 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4
am: 46442d1be1

Change-Id: I50616eafb788247b103911bd5ac899899e3ba47c
2016-09-21 21:55:52 +00:00
Ajay Panicker
438cc52ca1 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1
am: 8fd324c33f

Change-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d
2016-09-21 21:55:46 +00:00
TreeHugger Robot
22c9458a13 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev 2016-09-21 21:47:02 +00:00
TreeHugger Robot
162c80bf0c Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev 2016-09-21 21:46:53 +00:00
TreeHugger Robot
8ba2549592 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev 2016-09-21 21:46:43 +00:00
Amith Yamasani
be2db1ef72 Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev 2016-09-21 21:38:22 +00:00
Ajay Panicker
a5e128ba97 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours
am: 7cd1668893

Change-Id: Ibe7158ab142e8c566b05dc370c77393231f1f507
2016-09-21 21:31:00 +00:00
Ajay Panicker
2cf025f976 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours
am: 57fdbb97a6

Change-Id: I73e6ebd27ecabc7510ef9661eb1fcacdb2bafccf
2016-09-21 21:30:13 +00:00
Kevin Hufnagle
92fd1f0547 docs: Fix for clarification fo location permissions, hardware
Bug: 28052540
Change-Id: I88ce44f19085f0c41177c22768e1b3a6c0e869da
2016-09-21 14:16:47 -07:00
Ajay Panicker
35d1b45b0f Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
am: c119a677c4

Change-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d
2016-09-21 21:15:59 +00:00
Ajay Panicker
8fd324c33f [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am: 786e2694b1

Change-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3
2016-09-21 21:15:56 +00:00
Ajay Panicker
7cd1668893 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am: f78ff48d0d  -s ours

Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
2016-09-21 21:15:40 +00:00
Ajay Panicker
57fdbb97a6 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am: 27b3d578b9  -s ours

Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
2016-09-21 21:15:37 +00:00
Ajay Panicker
4431d6cb5b Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
am: 447ac4b31d

Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb
2016-09-21 21:15:35 +00:00
Ajay Panicker
46442d1be1 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am: 85bc33a8f4

Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
2016-09-21 21:15:32 +00:00
Ajay Panicker
447ac4b31d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev 2016-09-21 21:08:10 +00:00
Ajay Panicker
f78ff48d0d Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev 2016-09-21 21:08:07 +00:00
Ajay Panicker
c119a677c4 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev 2016-09-21 21:08:04 +00:00
Josh Horwich
999fe148e4 Docs: Fix missing space
A space got lost when this document got edited recently, this
simply puts it back.

Bug: None
Test: None
Change-Id: I87ee55322d90f6113c3611050d5f5ce1a43bdccb
2016-09-21 14:04:43 -07:00
Stuart Scott
434c8db80f Continue if package is not in system
bug:29546655
Change-Id: Ieb17534d60db4643180b915f9b10b0c79a2224e2
2016-09-21 14:04:22 -07:00
Tyler Gunn
103922f8c6 Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev 2016-09-21 19:56:49 +00:00
Amith Yamasani
43caafa2b6 Don't inform usage stats of interaction for a toast
If the process is forced to the foreground due to a toast,
don't inform usage stats of an interaction. Otherwise app standby
will be defeated easily.

Bug: 31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I100d839ef8cf361704fd5db4b26dcc878672a235
2016-09-21 18:53:50 +00:00
Fan Zhang
9096780031 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1
am: 9c4561370d

Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93
2016-09-21 16:05:28 +00:00
Fan Zhang
20370bb9b1 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c
am: 05df69d52a

Change-Id: I963115016cae383f47e4dfbb262200b945fd3b0d
2016-09-21 15:57:12 +00:00
Fan Zhang
9c4561370d Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
am: 32bd448cc1

Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
2016-09-21 15:38:12 +00:00
Fan Zhang
05df69d52a Fix NPE for WifiConfiguration in AccessPoint.
am: 51365c3b4c

Change-Id: I7d653816e70f38f0cce3a6bc8f0eaade8593866a
2016-09-21 15:38:08 +00:00