Ricky Wai
610fb8a3f2
Merge "Store work lock type even it uses unified lock" into nyc-dev
2016-05-26 13:46:12 +00:00
Nicolas Prévot
19d34821b9
Merge "Use correct user id when checking uri grants for notification." into nyc-dev
2016-05-26 10:37:32 +00:00
Yi Kong
03a1314f2e
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
2016-05-26 08:54:57 +00:00
Lajos Molnar
40585321d7
Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev
2016-05-26 06:14:04 +00:00
Dirk Dougherty
a283dabdf5
Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467
...
am: 1cf99365cb
2016-05-26 05:44:29 +00:00
Dirk Dougherty
1cf99365cb
Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a
...
am: a7c0788467
2016-05-26 05:35:46 +00:00
Dirk Dougherty
a7c0788467
Merge "Remove spurious url reference." into mnc-mr-docs
...
am: 1ed701493a
2016-05-26 05:17:01 +00:00
Dirk Dougherty
1ed701493a
Merge "Remove spurious url reference." into mnc-mr-docs
2016-05-26 05:03:25 +00:00
Chad Brubaker
86bceb87ca
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571
...
am: 11b56641e5
2016-05-26 04:47:44 +00:00
Joe Fernandez
68fb46153f
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048
...
am: 1a045584d4
2016-05-26 04:47:34 +00:00
Chad Brubaker
11b56641e5
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs
...
am: ce99e3c571
2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
...
am: 9e823c7048
2016-05-26 04:37:09 +00:00
Android Build Merger (Role)
ce99e3c571
Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs
2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048
Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs
2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
...
am: c0f99aebdc
2016-05-26 04:26:11 +00:00
Chad Brubaker
c0f99aebdc
Merge "Track changes to network security config manifest configuration" into mnc-mr-docs
2016-05-26 04:09:40 +00:00
Seigo Nonaka
ce9f5e3657
Merge "Fix system locale propagation during user creation." into nyc-dev
2016-05-26 03:51:39 +00:00
Dirk Dougherty
3930b5091e
Remove spurious url reference.
...
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
2016-05-25 20:29:59 -07:00
Trevor Johns
5513b6776e
docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e
...
am: 46c1d5a5d2
2016-05-26 02:19:23 +00:00
Trevor Johns
46c1d5a5d2
docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346
...
am: c8c2abed0e
2016-05-26 01:59:17 +00:00
Joe Fernandez
e8a0b488dc
docs: Remove Advertising ID page and redirect to GMS reference docs
...
b/28965089
Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
2016-05-25 18:36:12 -07:00
Trevor Johns
c8c2abed0e
docs: Fix broken link in Volley training am: 05dd9d2c29
...
am: 346114e346
2016-05-26 01:32:43 +00:00
Trevor Johns
346114e346
docs: Fix broken link in Volley training
...
am: 05dd9d2c29
2016-05-26 01:18:44 +00:00
TreeHugger Robot
fbf3a0964a
Merge "Use app's best locale if they override LocaleList" into nyc-dev
2016-05-26 01:11:03 +00:00
TreeHugger Robot
bc983c4431
Merge "N is API 24" into nyc-dev
2016-05-26 01:03:08 +00:00
Sid Soundararajan
7cb7a0aa60
Merge "Make content descriptions of task cards, the title description" into nyc-dev
2016-05-26 00:45:28 +00:00
Dianne Hackborn
dbcca24f8e
Merge "Fix issue #28964589 : Binding dies when (unrelated) component is disabled in package" into nyc-dev
2016-05-26 00:43:33 +00:00
Alan Viverette
8f0ab27570
Merge "Fix borderless colored button text color" into nyc-dev
2016-05-26 00:40:19 +00:00
Andrii Kulian
a1984286d3
Merge "Fix exception when trying to update config of detached stack" into nyc-dev
2016-05-26 00:24:10 +00:00
Android Build Merger (Role)
36a1b38e89
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev
2016-05-26 00:24:01 +00:00
Chris Tate
dbda4c2f9a
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8
...
am: 38a37f336f
2016-05-26 00:22:47 +00:00
TreeHugger Robot
dac0708ea0
Merge "Un-deprecated Android mock testing APIs" into nyc-dev
2016-05-26 00:22:29 +00:00
Phil Weaver
7ab1a4d286
Merge "Improve accessibility window title behavior" into nyc-dev
2016-05-26 00:11:25 +00:00
Sid Soundararajan
caa611f88d
Make content descriptions of task cards, the title description
...
Use the title description as content description for the task
card, this should be better for talkback.
BUG: 28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4
2016-05-25 17:08:12 -07:00
TreeHugger Robot
135c4760fd
Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev
2016-05-25 23:51:01 +00:00
Adam Lesinski
27d301667b
Use app's best locale if they override LocaleList
...
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.
Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45
N is API 24
...
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb
Merge "Per API review, revert the API renaming CL." into nyc-dev
2016-05-25 23:41:21 +00:00
Christopher Tate
38a37f336f
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca
...
am: c69aa838a8
2016-05-25 23:16:02 +00:00
Trevor Johns
05dd9d2c29
docs: Fix broken link in Volley training
...
Inline link from from "Making a Standard Request" to "Implementing a
Custom Request" had a typo in the URL string.
Change-Id: I8f7d79e47ea82f423b9e56ef6d908938564a3fe9
2016-05-25 16:13:21 -07:00
Dianne Hackborn
47fb83a1e2
Fix issue #28964589 : Binding dies when (unrelated) component is disabled in package
...
We go through the same path for uninstalling and changing an app...
both of which would do a full force stop. That is only appropriate
for uninstalling; for changing, we should just be killing its processes.
Change-Id: Ia87750d96d3e3eb7ee30841429eb926c20c5ad78
2016-05-25 16:12:02 -07:00
Philip P. Moltmann
00e3c23265
Merge "Move add-printer list headers to the right positions." into nyc-dev
2016-05-25 23:10:26 +00:00
Chris Tate
c69aa838a8
Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22
...
am: 600d4f61ca
2016-05-25 23:06:54 +00:00
Stephan Linzner
ebdc157bc0
Un-deprecated Android mock testing APIs
...
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.
Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
2016-05-25 22:54:27 +00:00
Christopher Tate
600d4f61ca
Merge "Backport of backup transport whitelist" into mnc-dev
...
am: 2cfc6baa22
2016-05-25 22:45:49 +00:00
Chong Zhang
e55e4b7f73
Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev
2016-05-25 22:42:56 +00:00
Chris Tate
2cfc6baa22
Merge "Backport of backup transport whitelist" into mnc-dev
2016-05-25 22:30:58 +00:00
Chong Zhang
73d4b44ce3
Update dock stack create mode after rotation if dock side changed
...
On some devices (such as tablets) dock stack could be created on top,
but put to right after rotation. Dock create mode needs to be updated
in this case, otherwise when a new stack is attached to the display
(for example launch into now-cropped fullscreen stack),
attachDisplayContent() will use wrong dock mode to derive the bounds.
bug: 28942558
Change-Id: I83e66aeac94bd3f96c4b6a0a740acf76234bbe82
2016-05-25 15:26:58 -07:00
Sid Soundararajan
436da616c8
Merge "Alternate method for adding dismiss in talkback" into nyc-dev
2016-05-25 22:23:05 +00:00
Antonio Cansado
c45f0aea71
Merge "Cleaning up NetworkStatsManager." into nyc-dev
2016-05-25 22:17:21 +00:00
