Commit Graph

277484 Commits

Author SHA1 Message Date
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
37298f15a9 Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
am: 7baf677ded

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

Change-Id: I82de1e6403306f0984d15db8448546aebf7ec107
2016-09-22 03:50:04 +00:00
Ajay Panicker
8919cc83bb Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f
am: dc0f9fa9c9  -s ours

Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987
2016-09-22 03:50:02 +00:00
Ajay Panicker
f65661939b 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 am: 94c08c2bed -s ours
am: d4fe288933

Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8
2016-09-22 03:49:50 +00:00
Elliot Waite
8ea167bf7a Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4
2016-09-22 03:49:12 +00:00
Elliot Waite
4a60ffd518 Revert fixed at links.
am: 7c70fed347

Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4
2016-09-22 03:49:08 +00:00
Ajay Panicker
3d4c737736 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours
am: 1448a693d8

Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0
2016-09-22 03:48:56 +00:00
Ajay Panicker
7f84596929 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f
am: 438cc52ca1  -s ours

Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf
2016-09-22 03:48:40 +00:00
Selim Cinek
cbd3c73f6e Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
am: 4c1c7f3e18

Change-Id: I74fe8ee556cf39459e61876dccab10140e3afe04
2016-09-22 03:48:38 +00:00
Jaewan Kim
91ccfa1def Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2
am: bea0b3ec06  -s ours

Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd
2016-09-22 03:48:37 +00:00
Selim Cinek
d4b03c47b5 Large icons now scale nicer when expanding bundles
am: 8a71ad032f

Change-Id: I391f56cca21177179ea033d7be08f649e7b61664
2016-09-22 03:48:34 +00:00
Adarsh Fernando
9a91d6662e Found a couple of more references to Android N.
am: 9af57aa309

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

Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76
2016-09-22 03:47:58 +00:00
Jaewan Kim
30d1440861 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca
am: 6bf115121c  -s ours

Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
2016-09-22 03:47:42 +00:00
Adarsh Fernando
453160c39d Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am: fe060d3f37

Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833
2016-09-22 03:47:02 +00:00
Ajay Panicker
1783182332 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours
am: c56c079470

Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db
2016-09-22 03:47:01 +00:00
Adarsh Fernando
0b8e646225 Docs: Cleanup of Preview language in Android 7.0 docs.
am: 4b6d939321

Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b
2016-09-22 03:46:55 +00:00
Jaewan Kim
bea0b3ec06 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c
am: e47b5adce2

Change-Id: Ie35fa2ebffc5f5369b1473f78c0bfeb38fdfc5ca
2016-09-22 03:23:14 +00:00
Jaewan Kim
6bf115121c DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267
am: 709d112eca

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

Change-Id: I00d1e9f1c7f41f0f15429a159833c8cbaf789342
2016-09-22 02:55:15 +00:00
Ben Lin
27628797aa Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am: ba0ee69a15 -s ours
am: 5340d7d849  -s ours

Change-Id: I653293d3e43fff57b4ddd651d01b10e46be6160c
2016-09-22 02:54:23 +00:00
Jaewan Kim
2d88f87a82 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours
am: 031fb04776

Change-Id: I05beb9fff4527be83812122be9d783c9a109cb01
2016-09-22 02:54:22 +00:00
Ben Lin
46a38a75eb DO NOT MERGE ANYWHERE am: 5e1e779098 -s ours
am: d979b4e187  -s ours

Change-Id: Iaef7d9494b81c77abb11b2fc93e944bcd10172d5
2016-09-22 02:53:21 +00:00
Kevin Hufnagle
0355128699 docs: Fixed syntax error in "Content URI patterns" code sample
Bug: 31624162
Change-Id: Id1720c3ebb6eff22384a48d8c1a4ed56abde00f4
2016-09-21 19:51:32 -07:00
Robert Carr
73a1fa7f2c Avoid entering display freeze mode when using seamless rotation.
If we enter seamless rotation through the
Activity#setRequestedOrientation->updateOrientationFromAppTokens(conf,
ibinder) codepath, it will helpfully try to freeze the display for us
after updating the orientation. Normally only
updateRotationUncheckedLocked does this and so the seamless rotation
logic there would prevent it...however in this path we fail to prevent
it and strange strange things happen.

Bug: 30642017
Change-Id: I12e94905781975f59384d609d12fa54b9fa4fba0
2016-09-22 02:33:47 +00:00
TreeHugger Robot
8dcd08ed04 Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev 2016-09-22 02:32:57 +00:00
Elliot Waite
c77b72f244 Merge "Revert fixed at links." into nyc-dev 2016-09-22 02:19:44 +00:00
TreeHugger Robot
3904e1bc34 Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev 2016-09-22 02:01:01 +00:00
Amith Yamasani
786cf76dc2 Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev am: be2db1ef72
am: 349a5ba1dc

Change-Id: I38817a0d71f679bcdb4d54f82840d0fcb3eb04a3
2016-09-22 01:38:17 +00:00
Ajay Panicker
d4fe288933 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
am: 94c08c2bed  -s ours

Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148
2016-09-22 01:37:37 +00:00
Ajay Panicker
1448a693d8 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976
am: 9c7ac98157  -s ours

Change-Id: I3bc0085154ca14e3bee294de6109e41e1ccd9fa5
2016-09-22 01:36:41 +00:00
Amith Yamasani
aa8e8c4ff9 Don't inform usage stats of interaction for a toast am: 43caafa2b6
am: 0775c2e29a

Change-Id: I3ee09b516288baca8eab2fb88ea905f91c042610
2016-09-22 01:36:21 +00:00
Ajay Panicker
a70fffe8e7 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b
am: 852e5a43b9  -s ours

Change-Id: I2327ac15699e1734d4cf3ae4e1f7e8a5aedc0b5b
2016-09-22 01:35:54 +00:00
Ajay Panicker
c56c079470 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1
am: 8be4dc7e16  -s ours

Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
2016-09-22 01:34:51 +00:00
Ajay Panicker
2309b98b25 Merge "Remove net_bt_stack group and replace it with bluetooth" 2016-09-22 01:32:33 +00:00
Robert Carr
42769fff6f Fix animation glitch with overlapping orientation changes.
Imagine the following scenario:
1. We want to begin a new app transition to an app which will change the
orientation.
2. A rotation animation from a previous rotation change is in progress.
3. Windows have finished drawing the first orientation change,
   so the display is already unfrozen.
In this case, we won't have a chance to select the new orientation which
our pending transition requires, because updateRotationUncheckedLocked
will bail due to the existing animation being in progress. This causes
the app behind to be revealed in the incorrect orientation (sometimes
creating landscape launchers) and the transition to be interrupted
halfway by the screenshot. In this case we can just defer the app
transition until the rotation animation has had a chance to complete.

Bug: 31098404
Change-Id: I1ae1041d3018d5681b46cd39c2d582861f0b014e
2016-09-21 18:14:02 -07:00
Etan Cohen
78ef40a668 [NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277e)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
2016-09-21 18:11:33 -07:00
Adarsh Fernando
dafcbfa693 Removing a temporary redirect for /ndk/guides/cmake.html
Change-Id: I45d9aa20bca3e37c4240601ae75cca24081a63f6
2016-09-21 17:55:31 -07:00
Adam Lesinski
43158773b4 AAPT: Don't imply specific location hardware for dump badging
Permissions such as android.permission.ACCESS_FINE_LOCATION
and android.permission.ACCESS_COARSE_LOCATION assumed the underlying feature
technology and aapt dump badging would emit an implied feature.

This is no longer accurate, so the only implied feature is on the general
android.hardware.location when the target SDK of the app is 21+.

Bug:25218770
Change-Id: Ica9ebf7d4f360b137af54a8c8fd6c0358cd9be6a
2016-09-21 17:52:58 -07:00
Etan Cohen
dcac00f325 Merge "[NAN] Method renames based on API council feedback" 2016-09-22 00:52:48 +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
TreeHugger Robot
7baf677ded Merge "Fix WallpaperManager APIs" into nyc-mr1-dev 2016-09-22 00:35:13 +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
Andrii Kulian
ee05681139 Fix stopping activity when removed from waiting visible
During refactoring in ag/613666 waitingVisible flag clearing
was mistakenly removed. It was added back in ag/1221328 but
only for activities that are finishing.
This caused activity not being stopped in some cases when
window visibility change was handled before receiving idle
callback from client. This is easily reproducible when there
is a scene transition animation specified.

Bug: 31078584
Change-Id: Ic09c5199ad4fceae0607e4bcce02be5335c8870b
2016-09-22 00:17:43 +00:00
Bill Yi
e0e30f5320 Import translations. DO NOT MERGE
Change-Id: Ibe04ecdfb022f2fdb5d5d918c823951323a00439
Auto-generated-cl: translation import
2016-09-21 17:14:49 -07:00
Bill Yi
7fea90bfec Import translations. DO NOT MERGE
Change-Id: If35faadb6cd94b0cd490a5db7310371208fe3674
Auto-generated-cl: translation import
2016-09-21 17:08:47 -07:00
Selim Cinek
4c1c7f3e18 Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev 2016-09-21 23:51:04 +00:00
Ben Lin
5340d7d849 Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
am: ba0ee69a15  -s ours

Change-Id: I9fbfd898747aa183b91df605d85d91c797992ba3
2016-09-21 23:42:11 +00:00