Fyodor Kupolov
0a376f5619
Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev
2016-08-23 00:16:57 +00:00
Adam Seaton
aad9147dca
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev
...
am: ad1008d089 -s ours
Change-Id: I061b3254230cb99b93995bc498d59efbfdb4e4e3
2016-08-23 00:13:08 +00:00
Andy Hung
33a04f8333
DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information
...
am: 05a1df9967 -s ours
Change-Id: I913db67adcb23be439505d5eba438f1249fd8b8c
2016-08-23 00:13:06 +00:00
Adam Seaton
fcd16254c6
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev
...
am: 0f1e7ab1d3 -s ours
Change-Id: Ic46aeb12f03e20c3379740934b4c80b228499124
2016-08-23 00:13:04 +00:00
George Mount
27d769e3b0
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
...
am: c9373e5505 -s ours
Change-Id: I9cd703751daedc696285d7023dc8f1aac1deaa3e
2016-08-23 00:13:02 +00:00
Todd Kennedy
655932af79
DO NOT MERGE ANYWHERE: Release mPackages lock earlier
...
am: bab7c28e5e -s ours
Change-Id: I8e3db3e883768c3af283a549aa7f464a7408a36e
2016-08-23 00:12:59 +00:00
Dirk Dougherty
1dba7ddf3a
Doc change: updates for final N landing page and related resources. am: b0ca00431f
...
am: b78a9bc5fe
Change-Id: I50dd9fff2cfc7653f90b5f2b2d00cfc2f95d8fb2
2016-08-23 00:12:57 +00:00
David Friedman
d6ad4f051e
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am: 410ae5b004
...
am: e5036b3cab
Change-Id: I0e0b5b2f9f0196f1caed4d2e76aa7e70cd346805
2016-08-23 00:12:54 +00:00
David Friedman
7208e94355
Docs: Adding information to Building-for-Billions landing page. am: cbaf3f9986
...
am: 2663c419c0
Change-Id: Ia66d68ac34f987e9724731ea96ef21c98db8eca3
2016-08-23 00:06:34 +00:00
David Friedman
32d77972d5
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am: 162a0005ac
...
am: c02c6b8fb0
Change-Id: Icabe2b1760a14ef31d1ce092bec0ec2b42d16bcd
2016-08-23 00:06:27 +00:00
David Friedman
5e1468cdbd
Docs: Adds a redirect to make it easier to access Performance section on DAC. am: 196cb73dbb
...
am: f5c5eb0045
Change-Id: I3893d4f1e0a3122afc4ed180727d66345b3f4090
2016-08-23 00:06:20 +00:00
Jim Miller
a7025c283c
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a -s ours am: ce0856f702
...
am: 41d1827fd3
Change-Id: I305d7afc49624716b67dd1d54ea13b3f76cd2216
2016-08-23 00:06:12 +00:00
Jim Miller
634aafc181
Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb -s ours am: f159feff98
...
am: ade6f4df5b
Change-Id: Ib1eae543579908fe40c51186f7ab54fdde52b4a9
2016-08-23 00:06:05 +00:00
Sudheer Shanka
8887e258a9
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c -s ours am: e49de5e073
...
am: 105453e170
Change-Id: Ic86e58a455b3d8d7bb2c2ed7eee66910e28115ca
2016-08-22 23:57:09 +00:00
Amith Yamasani
110bd114a8
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7 -s ours am: f705730667
...
am: d09a6aa0f0
Change-Id: I00d2208a02f04cc5ca58a66977ddcf8b4da1983a
2016-08-22 23:57:07 +00:00
Sudheer Shanka
3cf8ad97d0
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd942
...
am: f1e0a4a60c
Change-Id: I9372581fd75519c51d034f9bc59b62f7b67433af
2016-08-22 23:57:05 +00:00
Amith Yamasani
250a509a68
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441
...
am: ac9bb3886d
Change-Id: I35e8e83f565bea86f409da9dd7ca7314747d6ed9
2016-08-22 23:57:03 +00:00
Svetoslav Ganov
fb53efd8f3
Add resource based mechanism to grant default permissions
...
am: d44d46aa50
Change-Id: If97c1e008dccf35e0c3e8623b2a461db6e46023c
2016-08-22 23:57:00 +00:00
Rob Carr
7ae506260e
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
2016-08-22 23:53:04 +00:00
Yang Ni
c069ed7f8c
Updated user document for Single-Source RenderScript
...
Bug: 29875503
Bug: 29879448
Added a section introducing the new single-source feature.
Local staging:
http://yangni.mtv.corp.google.com/guide/topics/renderscript/compute.html
This updates
https://developer.android.com/guide/topics/renderscript/compute.html
Change-Id: I62dda3ab60b1678a9580fd2873f64f33d9696e13
2016-08-22 23:33:13 +00:00
Dianne Hackborn
d6ece3e175
Merge "Fix issue #30929080 : Default Assist app is set to None..." into nyc-mr1-dev
2016-08-22 23:22:59 +00:00
Todd Kennedy
ee2df0390e
Merge "Allow permission group updates" into nyc-mr1-dev
2016-08-22 23:18:48 +00:00
Todd Kennedy
0060d6eda1
Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev
2016-08-22 23:17:22 +00:00
Todd Kennedy
fea1b776e9
Implement new ephemeral resolver design
...
In the new design, the ephemeral installer can be returned from
queryIntentActivities which means any intent resolution could potentially
return the installer. Additionally, the new design calls for a platform
defined broadcast receiver that receives the status from the ephemeral
installer. This receiver then starts the final intent -- either to launch
the ephemeral application or to launch the fallback.
For more detail, see go/ephemeral-design
Bug: 30805203
Bug: 30273584
Change-Id: I6644bbb4f180d2d22c63af04b9857577516344a9
(cherry picked from commit 8e2d9d1d90 )
2016-08-22 16:09:13 -07:00
TreeHugger Robot
c7136b3b3c
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev
2016-08-22 22:55:15 +00:00
Todd Kennedy
afb5269ad6
No need to check package name
...
Change-Id: I8c403ca2bc38f2c7191b6e9a709286ac7e450ac4
Fixes: 30958291
2016-08-22 15:47:22 -07:00
Sudheer Shanka
a0994c6d58
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours am: b31a6955a4 -s ours
...
am: 52d0f48f80
Change-Id: I01d36d2e160c3e33e3f2701843d768b5f581af1b
2016-08-22 22:38:23 +00:00
Teng-Hui Zhu
0c03664fa6
Add an new internal DrawableContainer to handle animation scale == 0 case.
...
This will help ProgressBar to show something meaningful when animation scale is 0.
b/30877925
Change-Id: Ieb2e78712999d2e3f3a2a234bc605b4821ae41c0
2016-08-22 15:36:32 -07:00
Sudheer Shanka
52d0f48f80
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab am: e0d1ff1c42 -s ours
...
am: b31a6955a4 -s ours
Change-Id: I6fb134e75355bc1fdcc2dd9a21b51802575c28f3
2016-08-22 22:33:15 +00:00
Sudheer Shanka
f21534a288
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am: bbbb514bc9
...
am: 6a50270944
Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368
2016-08-22 22:33:10 +00:00
Sudheer Shanka
6a50270944
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours
...
am: bbbb514bc9
Change-Id: I47bfb18ce300e52a092da534b8aac720f0b8aa3f
2016-08-22 22:28:24 +00:00
Sudheer Shanka
b31a6955a4
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab
...
am: e0d1ff1c42 -s ours
Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef
2016-08-22 22:19:10 +00:00
Sudheer Shanka
bbbb514bc9
resolve merge conflicts of 270947f to klp-modular-dev
...
am: 76c4b2a7b6 -s ours
Change-Id: Icdcd0929eb7bd32665e91fe2598af46db3ff01bd
2016-08-22 22:19:06 +00:00
Sudheer Shanka
e0d1ff1c42
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207
...
am: 21ef672cab
Change-Id: Ia073a40c330038e77ff5992c056a8fe0a5924edb
2016-08-22 22:11:52 +00:00
Fyodor Kupolov
19551a8d8d
Added getDataPreloadsMediaDirectory
...
Bug: 31015966
Change-Id: I8b4117daae2b1f7a59d6a192b34a105f91cbac55
2016-08-22 21:59:01 +00:00
Tenghui Zhu
f05765e3c4
Merge "Correctly report the transparent region" into nyc-mr1-dev
2016-08-22 21:56:37 +00:00
Salvador Martinez
09b64ade22
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
2016-08-22 21:55:20 +00:00
TreeHugger Robot
081e393103
Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev
2016-08-22 21:40:16 +00:00
Rob Carr
b19915bea8
Merge "PopupWindow: Be more consistent about Gravity calculation." into nyc-mr1-dev
2016-08-22 20:47:10 +00:00
Robert Carr
828ec3dc51
Only allow focused window to select seamless rotation.
...
We require apps to opt in to seamless rotation. If a dialog or some such
has popped up above them, the dialog may not be prepared to rotate
seamlessly and we should just fall back to the old behavior for now.
Bug: 30968345
Change-Id: Ib9a7352ed84d41076bdd162bf38d151b053a307e
2016-08-22 13:35:52 -07:00
Tenghui Zhu
5cb0c13f76
Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev
2016-08-22 20:35:44 +00:00
TreeHugger Robot
bf1d4cae3b
Merge "Update navup button content description when it's menu." into nyc-mr1-dev
2016-08-22 20:28:24 +00:00
TreeHugger Robot
8499c13740
Merge "DO NOT MERGE: Treat unknown tooltype as touch." into nyc-mr1-dev
2016-08-22 20:15:26 +00:00
Alan Viverette
66b3a0d1aa
Avoid potential re-entry as a result of child mutation
...
Don't set the callback until we're all done making changes.
Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0 )
2016-08-22 20:00:30 +00:00
TreeHugger Robot
156d897f2e
Merge "telephony/roam: Do not show roaming icon for Videotron SIM camped on Canada network" into nyc-mr1-dev
2016-08-22 19:44:35 +00:00
Sanket Padawe
914354f334
Merge "Fix roam icon issues in Austria" into nyc-mr1-dev
2016-08-22 19:10:23 +00:00
Dirk Dougherty
79d9e9df2e
Doc change: intl page updates for final n release.
...
am: e816f1f542
Change-Id: I15a51ee5bdb78d6d2394a95e27cc6ddca5034960
2016-08-22 18:57:53 +00:00
Julius D'souza
3275a3a5a5
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
...
Bug: 18572096
Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-22 11:40:03 -07:00
fionaxu
d0a7649f53
redact PII only for non-null value and apply SHA-1
...
Bug: 30073833
Change-Id: Iec311ba27dfd07c52df4a05cf89a566994f66ba9
2016-08-22 11:36:16 -07:00
Teng-Hui Zhu
d64255f61d
Update the javaDoc for VectorDrawable and AnimatedVectorDrawable
...
b/30269243
Change-Id: I139a3fcac95c41a667fa06aa3223b812caad6243
(cherry picked from commit c224417511 )
2016-08-22 18:32:09 +00:00