Baligh Uddin
576a32da20
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 17:57:26 +00:00
Baligh Uddin
cb6e5df633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 17:57:19 +00:00
Baligh Uddin
e6ee2d7e11
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 17:54:34 +00:00
Bert McMeen
51136f409f
docs: Downloads change for \'I\' build am: 90433cf4d8
...
am: 996c9839d6
2016-05-18 17:37:17 +00:00
Bert McMeen
996c9839d6
docs: Downloads change for \'I\' build
...
am: 90433cf4d8
2016-05-18 17:32:01 +00:00
TreeHugger Robot
0d902adbbc
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
2016-05-18 17:09:46 +00:00
Tony Mak
ae13e18c55
Should check isDeviceSecure in shouldConfirmCredentials
...
The NPE is because createConfirmDeviceCredentialIntent returns a null
intent when it founds that user does not set a secure lock.
So the fix is we should check is the user set a secure lock screen as well.
The reason the crash only happens in multi-window flow because
we have null checking in
the normal flow (i.e. interceptWithConfirmCredentialsIfNeeded).
But I think we better check it explicitly.
Bug: 28716456
Change-Id: Ib204cd02c0007bd1df36908bb3b5254ec4ffb914
2016-05-18 16:58:13 +00:00
Mady Mellor
048cabdbcb
Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev
2016-05-18 16:43:12 +00:00
Bert McMeen
90433cf4d8
docs: Downloads change for 'I' build
...
Bug: 28833659
Change-Id: Ifd5865d78960a58a6e8238225bc206978e84eb8f
2016-05-18 09:34:09 -07:00
TreeHugger Robot
e821f3d032
Merge "Use batching to set firewall rules." into nyc-dev
2016-05-18 16:26:45 +00:00
Jaewan Kim
4e08800a7e
Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev
2016-05-18 15:46:46 +00:00
Robert Sesek
f45bc095c6
Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
2016-05-18 15:25:41 +00:00
Philip P. Moltmann
746de4e9c8
Merge "Handle printers selected by SelectPrinter activity" into nyc-dev
2016-05-18 15:24:21 +00:00
Cheryl Potter
3e9304127e
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74
...
am: d45800d2e3
2016-05-18 15:22:34 +00:00
Cheryl Potter
d45800d2e3
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616
...
am: 06c815fc74
2016-05-18 15:17:44 +00:00
Cheryl Potter
06c815fc74
docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592
...
am: d1da82f616
2016-05-18 15:11:54 +00:00
Michael Wright
7e91ec88ef
Merge changes from topic 'bad-attr-buildfix' into nyc-dev
...
* changes:
Fix attr link in support lib docs.
Revert "Revert "docs: Creating new support library revision history page""
2016-05-18 15:07:37 +00:00
Narayan Kamath
9f33e5cccc
Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev
2016-05-18 15:04:19 +00:00
Michael Wright
ae316f8424
Fix attr link in support lib docs.
...
It accidentally pointed to the media router resources rather than the
app compat ones.
Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
2016-05-18 15:58:39 +01:00
Michael Wright
9363b31196
Revert "Revert "docs: Creating new support library revision history page""
...
This reverts commit 982fd04335
2016-05-18 15:24:36 +01:00
Julia Reynolds
5201a6246d
Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev
2016-05-18 14:09:50 +00:00
Narayan Kamath
6d99f79671
PackageManager: Fix reference profile canonicalization.
...
Foreign dex markers are named in the runtime by calling realpath(3) on the input
dexfile path and replacing "/" with "@". On the Java side, we're using
File.getCanonicalPath, which is similar but isn't quite the same. It tries
to call realpath() directly, but if that fails, it resorts to a series of
increasingly desperate measures to calculate a "canonical path". We just
use realpath instead.
Also, don't attempt to delete a profile if canonicalization fails.
bug: 28740848
Change-Id: Ie5d5af590187e793db633342a42b923865e5c005
2016-05-18 12:33:56 +00:00
Nicolas Prévot
bbd26bc023
Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev
2016-05-18 11:21:45 +00:00
Bart Sears
982fd04335
Revert "docs: Creating new support library revision history page"
...
This reverts commit 09e9d24bcf
2016-05-18 07:22:20 +00:00
Joe Fernandez
f6e624b5a5
Merge "docs: Pages for Instant Apps" into mnc-io-docs am: ad1639e276
...
am: 24d753f134
2016-05-18 07:15:09 +00:00
Eric Schmidt
24d753f134
Merge "docs: Pages for Instant Apps" into mnc-io-docs
...
am: ad1639e276
2016-05-18 07:10:14 +00:00
Joe Fernandez
ad1639e276
Merge "docs: Pages for Instant Apps" into mnc-io-docs
2016-05-18 07:04:52 +00:00
David Friedman
c25a09d495
Docs: Final changes to DP3 docs. am: 82c668ffc0
...
am: f28da5297c
2016-05-18 07:04:42 +00:00
David Friedman
f28da5297c
Docs: Final changes to DP3 docs.
...
am: 82c668ffc0
2016-05-18 07:01:40 +00:00
David Friedman
82c668ffc0
Docs: Final changes to DP3 docs.
...
Change-Id: Ia79f288e6231ef37c25a826653dd9b2cf465542f
2016-05-17 23:53:21 -07:00
Eric Schmidt
ff81597f9b
docs: Pages for Instant Apps
...
Bug: 28317418
Change-Id: I4a6df533435f1637dbfd6225c345985366cce7b3
2016-05-17 23:53:13 -07:00
Joe Fernandez
449d6435ca
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs am: 19fc346171
...
am: 14e1f1cd33
2016-05-18 06:46:55 +00:00
Joe Fernandez
14e1f1cd33
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs
...
am: 19fc346171
2016-05-18 06:42:01 +00:00
Joe Fernandez
19fc346171
Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs
2016-05-18 06:32:57 +00:00
Joe Fernandez
4672669ff9
docs: Wear Preview 2 - fixes and improvements
...
Change-Id: I0b5ea60157dfa21aa17765571d26c06f5ff866df
2016-05-17 23:23:47 -07:00
David Friedman
06d085ecf1
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs am: 36af257133
...
am: 08016e21d3
2016-05-18 06:12:16 +00:00
David Friedman
08016e21d3
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs
...
am: 36af257133
2016-05-18 06:09:44 +00:00
David Friedman
36af257133
Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs
2016-05-18 05:57:40 +00:00
David Friedman
69fe28ea2b
Docs: Some typo fixes for Wear 2.0 Preview docs.
...
Change-Id: I87d6d14c95f6350aa36ee71b99cf86b82cc0902a
2016-05-17 22:55:04 -07:00
David Friedman
0cc059436a
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs am: e293ff3bf1
...
am: fc1bb6e14d
2016-05-18 05:31:05 +00:00
David Friedman
fc1bb6e14d
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs
...
am: e293ff3bf1
2016-05-18 05:27:56 +00:00
David Friedman
e293ff3bf1
Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs
2016-05-18 05:21:24 +00:00
Joe Fernandez
6f054c4a78
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs am: b308d13fe2
...
am: 5bc0128ca0
2016-05-18 05:08:33 +00:00
David Friedman
ab751a8946
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs am: 08c32762bb
...
am: 4850be7bf9
2016-05-18 05:08:28 +00:00
David Friedman
202373932f
Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.
...
Change-Id: Ie30cac9f4eb955fc2a06b98348855c71941b9c8d
2016-05-17 22:06:28 -07:00
Joe Fernandez
5bc0128ca0
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs
...
am: b308d13fe2
2016-05-18 05:03:30 +00:00
David Friedman
4850be7bf9
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs
...
am: 08c32762bb
2016-05-18 05:03:27 +00:00
Joe Fernandez
b308d13fe2
Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs
2016-05-18 04:57:32 +00:00
David Friedman
08c32762bb
Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs
2016-05-18 04:54:36 +00:00
Joe Fernandez
f48a07418b
docs: Wear Preview 2.0 support page updates
...
Change-Id: I78f461813d154ebbd3b4ea94f80280e265a94983
2016-05-17 21:54:36 -07:00
