Elliot Waite
ffb31e9954
Merge "Revert fixed at links." into nyc-dev am: c77b72f244
...
am: 8ea167bf7a
2016-09-22 06:46:29 +00:00
Elliot Waite
e2b498241a
Revert fixed at links. am: 7c70fed347
...
am: 4a60ffd518
2016-09-22 06:45:29 +00:00
Adarsh Fernando
acb068a213
Found a couple of more references to Android N. am: 9af57aa309
...
am: 9a91d6662e
2016-09-22 06:44:43 +00:00
Adarsh Fernando
551d5d7f7f
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37
...
am: 453160c39d
2016-09-22 06:43:57 +00:00
Adarsh Fernando
059c09784d
Docs: Cleanup of Preview language in Android 7.0 docs. am: 4b6d939321
...
am: 0b8e646225
2016-09-22 06:43:14 +00:00
Stuart Scott
a676b157fb
Merge "Continue if package is not in system" into nyc-dr1-dev
...
am: cffe1f48d3
2016-09-22 06:41:55 +00:00
Stuart Scott
0845b025aa
Continue if package is not in system
...
am: 434c8db80f
2016-09-22 06:41:52 +00:00
Jaewan Kim
8a168a7c5d
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a
...
am: f7f452fd28
2016-09-22 06:41:03 +00:00
Ajay Panicker
0241b6d88a
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
...
am: 8919cc83bb
2016-09-22 06:41:02 +00:00
Jaewan Kim
345d75bf88
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am: 8ba2549592
...
am: 60d2af330b
2016-09-22 06:41:02 +00:00
Jaewan Kim
e13dc68953
DO NOT MERGE Check caller for sending media key to global priority session am: 09c3df004b
...
am: 01796f794d
2016-09-22 06:40:10 +00:00
Jaewan Kim
64110c6bf1
DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776
...
am: 2d88f87a82
2016-09-22 06:40:05 +00:00
Jaewan Kim
b38fbf9894
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
...
am: 5b05226586
2016-09-22 06:39:33 +00:00
Jaewan Kim
9477c1674c
DO NOT MERGE Check caller for sending media key to telephony service
...
am: d1641e8c27
2016-09-22 06:39:24 +00:00
Ajay Panicker
c1f8a09c1e
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours
...
am: ed82c6fac8
2016-09-22 06:10:41 +00:00
Bill Yi
6394011a86
Import translations. DO NOT MERGE
...
Change-Id: Ib207a07629651b14f450065e8314b2d8b3252c35
Auto-generated-cl: translation import
2016-09-21 23:05:36 -07:00
Bill Yi
a6c51e2c94
Import translations. DO NOT MERGE
...
Change-Id: I2ebb252040d261a9ce7dc01d080b9cc82c644533
Auto-generated-cl: translation import
2016-09-21 22:59:39 -07:00
Adam Lesinski
392c08c5ba
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev am: 8dcd08ed04
...
am: de3ac160b0
2016-09-22 05:41:37 +00:00
Adam Lesinski
5c60cb9208
AAPT: Don't imply specific location hardware for dump badging am: 43158773b4
...
am: 7f56759cfd
2016-09-22 05:40:44 +00:00
Bill Yi
7060296d02
Import translations. DO NOT MERGE
...
Change-Id: I55e1719cddf0d684ff7b5c89f11a1d0c6bb49a97
Auto-generated-cl: translation import
2016-09-21 22:35:25 -07:00
Jaewan Kim
5b05226586
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
2016-09-22 05:19:37 +00:00
Andrii Kulian
627c10bb67
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev am: 3904e1bc34
...
am: ae53cef574
2016-09-22 05:03:18 +00:00
Andrii Kulian
a646e8d657
Fix stopping activity when removed from waiting visible am: ee05681139
...
am: 273acdcefa
2016-09-22 05:02:23 +00:00
Adam Powell
2646d543bc
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev am: 33c9713bdd
...
am: 4a8e154109
2016-09-22 05:01:34 +00:00
Adam Powell
d10cf26137
Don't hold old host callback for fragments on the back stack am: 180202f221
...
am: 5254ef7bd3
2016-09-22 05:00:40 +00:00
Jeff Sharkey
e5d4c0b6df
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev am: b90ae85acc
...
am: 21c246b726
2016-09-22 04:59:30 +00:00
Ajay Panicker
630d577349
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
...
am: f65661939b
2016-09-22 04:58:44 +00:00
Jeff Sharkey
15b0cc92cf
Rename should behave like create: avoid conflict. am: 2c89a4c170
...
am: 0e033491ca
2016-09-22 04:58:43 +00:00
Edward Savage-Jones
71189eda8e
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev am: 7baf677ded
...
am: 37298f15a9
2016-09-22 04:57:57 +00:00
Ajay Panicker
f6d8037708
[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
...
am: 3d4c737736
2016-09-22 04:57:53 +00:00
Edward Savage-Jones
e6c08b3fac
Fix WallpaperManager APIs am: 6009d9db88
...
am: 50fe2c4847
2016-09-22 04:57:05 +00:00
Ajay Panicker
73607db5a1
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
...
am: d677e8d413
2016-09-22 04:57:01 +00:00
Selim Cinek
f659ce3437
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev am: 4c1c7f3e18
...
am: cbd3c73f6e
2016-09-22 04:56:14 +00:00
Ajay Panicker
993015ce9a
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470
...
am: 1783182332
2016-09-22 04:56:04 +00:00
Etan Cohen
3501748dea
Merge "[NAN] Method renames based on API council feedback"
...
am: dcac00f325
2016-09-22 04:55:21 +00:00
Jaewan Kim
b2403f3102
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13
...
am: 78fa55e261
2016-09-22 04:55:18 +00:00
Adam Lesinski
de3ac160b0
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
...
am: 8dcd08ed04
2016-09-22 04:55:17 +00:00
Selim Cinek
7281617a19
Large icons now scale nicer when expanding bundles am: 8a71ad032f
...
am: d4b03c47b5
2016-09-22 04:55:17 +00:00
Adam Lesinski
7f56759cfd
AAPT: Don't imply specific location hardware for dump badging
...
am: 43158773b4
2016-09-22 04:55:13 +00:00
Ajay Panicker
ed82c6fac8
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours
...
am: 7f84596929
2016-09-22 04:54:32 +00:00
Jaewan Kim
ff1c1993b7
DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106
...
am: 868d586c98
2016-09-22 04:54:25 +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
Jaewan Kim
4167620d33
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
...
am: 91ccfa1def
2016-09-22 04:29:59 +00:00
Jaewan Kim
ba1d8300be
DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours
...
am: 30d1440861
2016-09-22 04:29:01 +00:00
Andrii Kulian
ae53cef574
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
...
am: 3904e1bc34
2016-09-22 03:54:13 +00:00
Andrii Kulian
273acdcefa
Fix stopping activity when removed from waiting visible
...
am: ee05681139
2016-09-22 03:54:10 +00:00
Jaewan Kim
d1641e8c27
DO NOT MERGE Check caller for sending media key to telephony service
...
Prevent sending media key events from the non-system app to the
telephony service through the AudioManager.dispatchMediaKeyEvent()
or sending media key broadcast directly.
Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-22 12:53:08 +09:00
Adam Powell
4a8e154109
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
...
am: 33c9713bdd
2016-09-22 03:52:39 +00:00
Adam Powell
5254ef7bd3
Don't hold old host callback for fragments on the back stack
...
am: 180202f221
2016-09-22 03:52:35 +00:00
Jeff Sharkey
21c246b726
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
...
am: b90ae85acc
2016-09-22 03:51:22 +00:00
